From eac62c6bb0d54c0cf79b3fdc16f74984d9a0d962 Mon Sep 17 00:00:00 2001 From: ITOH <72305210+itohatweb@users.noreply.github.com> Date: Sat, 10 Apr 2021 11:15:06 +0200 Subject: [PATCH] fix(handlers/messages): reaction remove event handler logic --- .../messages/MESSAGE_REACTION_REMOVE.ts | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts index 721b123cb..e2957810f 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts @@ -1,6 +1,5 @@ -import { botId, eventHandlers } from "../../bot.ts"; +import { eventHandlers } from "../../bot.ts"; import { cacheHandlers } from "../../cache.ts"; -import { structures } from "../../structures/mod.ts"; import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; import { DiscordMessageReactionRemove } from "../../types/messages/message_reaction_remove.ts"; @@ -11,35 +10,14 @@ export async function handleMessageReactionRemove( const message = await cacheHandlers.get("messages", payload.message_id); if (message) { - const reactionExisted = message.reactions?.find( - (reaction) => - reaction.emoji.id === payload.emoji.id && - reaction.emoji.name === payload.emoji.name, + const reaction = message.reactions?.find((reaction) => + reaction.emoji.id === payload.emoji.id && + reaction.emoji.name === payload.emoji.name ); - if (reactionExisted) reactionExisted.count--; - else { - const newReaction = { - count: 1, - me: payload.user_id === botId, - emoji: { ...payload.emoji, id: payload.emoji.id || undefined }, - }; - message.reactions = message.reactions - ? [...message.reactions, newReaction] - : [newReaction]; - } - - await cacheHandlers.set("messages", payload.message_id, message); - } - - if (payload.member && payload.guild_id) { - const guild = await cacheHandlers.get("guilds", payload.guild_id); - if (guild) { - const discordenoMember = await structures.createDiscordenoMember( - payload.member, - guild.id, - ); - await cacheHandlers.set("members", discordenoMember.id, discordenoMember); + if (reaction) { + reaction.count--; + await cacheHandlers.set("messages", payload.message_id, message); } }