From 4d42a57f10f11326253e12baebd43d006e6b3427 Mon Sep 17 00:00:00 2001 From: didinele Date: Thu, 11 Apr 2024 17:34:19 +0300 Subject: [PATCH 1/3] fix(actions): always emit message create for own messages --- packages/discord.js/src/client/actions/MessageCreate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discord.js/src/client/actions/MessageCreate.js b/packages/discord.js/src/client/actions/MessageCreate.js index 8e011fcd7394..36ea95de325d 100644 --- a/packages/discord.js/src/client/actions/MessageCreate.js +++ b/packages/discord.js/src/client/actions/MessageCreate.js @@ -16,7 +16,7 @@ class MessageCreateAction extends Action { } const existing = channel.messages.cache.get(data.id); - if (existing) return { message: existing }; + if (existing && existing.author.id !== this.client.user.id) return { message: existing }; const message = channel.messages._add(data); channel.lastMessageId = data.id; From 93d452f0e5dda65f282b1464c899619eebe147c0 Mon Sep 17 00:00:00 2001 From: didinele Date: Thu, 11 Apr 2024 17:36:51 +0300 Subject: [PATCH 2/3] fix: don't re-cache --- packages/discord.js/src/client/actions/MessageCreate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discord.js/src/client/actions/MessageCreate.js b/packages/discord.js/src/client/actions/MessageCreate.js index 36ea95de325d..c3412e98fb4d 100644 --- a/packages/discord.js/src/client/actions/MessageCreate.js +++ b/packages/discord.js/src/client/actions/MessageCreate.js @@ -17,7 +17,7 @@ class MessageCreateAction extends Action { const existing = channel.messages.cache.get(data.id); if (existing && existing.author.id !== this.client.user.id) return { message: existing }; - const message = channel.messages._add(data); + const message = existing ?? channel.messages._add(data); channel.lastMessageId = data.id; /** From 8299e52e3fa6d919eea075fcae65ada8d2fe8bfe Mon Sep 17 00:00:00 2001 From: didinele Date: Fri, 12 Apr 2024 17:20:46 +0300 Subject: [PATCH 3/3] fix: user can be missing --- packages/discord.js/src/client/actions/MessageCreate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discord.js/src/client/actions/MessageCreate.js b/packages/discord.js/src/client/actions/MessageCreate.js index c3412e98fb4d..070a9f58eeee 100644 --- a/packages/discord.js/src/client/actions/MessageCreate.js +++ b/packages/discord.js/src/client/actions/MessageCreate.js @@ -16,7 +16,7 @@ class MessageCreateAction extends Action { } const existing = channel.messages.cache.get(data.id); - if (existing && existing.author.id !== this.client.user.id) return { message: existing }; + if (existing && existing.author?.id !== this.client.user.id) return { message: existing }; const message = existing ?? channel.messages._add(data); channel.lastMessageId = data.id;