From 71dc4fc2e73a8fd000f5e82eacc5fbde5f7e1500 Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Tue, 3 Sep 2024 00:11:08 +0300 Subject: [PATCH 1/2] fix(Message): reacting returning undefined --- packages/discord.js/src/client/actions/Action.js | 10 ++++++++++ .../src/client/actions/MessageReactionAdd.js | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/discord.js/src/client/actions/Action.js b/packages/discord.js/src/client/actions/Action.js index 96170ee87d7e..92bc1c108f48 100644 --- a/packages/discord.js/src/client/actions/Action.js +++ b/packages/discord.js/src/client/actions/Action.js @@ -111,6 +111,16 @@ class GenericAction { getThreadMember(id, manager) { return this.getPayload({ user_id: id }, manager, id, Partials.ThreadMember, false); } + + spreadInjectedData(data) { + const ret = {}; + + for (const symbol of Object.getOwnPropertySymbols(data)) { + ret[symbol] = data[symbol]; + } + + return ret; + } } module.exports = GenericAction; diff --git a/packages/discord.js/src/client/actions/MessageReactionAdd.js b/packages/discord.js/src/client/actions/MessageReactionAdd.js index 9c9ffbc874a0..b32f7154f102 100644 --- a/packages/discord.js/src/client/actions/MessageReactionAdd.js +++ b/packages/discord.js/src/client/actions/MessageReactionAdd.js @@ -23,7 +23,13 @@ class MessageReactionAdd extends Action { if (!user) return false; // Verify channel - const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id }); + const channel = this.getChannel({ + id: data.channel_id, + guild_id: data.guild_id, + user_id: data.user_id, + ...this.spreadInjectedData(data), + }); + if (!channel?.isTextBased()) return false; // Verify message From bbd437b1cb5b4acac59ab4cf2556a459622231d0 Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Tue, 3 Sep 2024 00:18:14 +0300 Subject: [PATCH 2/2] chore: apply suggestion --- packages/discord.js/src/client/actions/Action.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/discord.js/src/client/actions/Action.js b/packages/discord.js/src/client/actions/Action.js index 92bc1c108f48..b5f1f756b4a2 100644 --- a/packages/discord.js/src/client/actions/Action.js +++ b/packages/discord.js/src/client/actions/Action.js @@ -113,13 +113,7 @@ class GenericAction { } spreadInjectedData(data) { - const ret = {}; - - for (const symbol of Object.getOwnPropertySymbols(data)) { - ret[symbol] = data[symbol]; - } - - return ret; + return Object.fromEntries(Object.getOwnPropertySymbols(data).map(symbol => [symbol, data[symbol]])); } }