fix: awaitMessageComponent with MessageComponentInteractions (#8598)

* fix: `awaitMessageComponent` with `MessageComponentInteraction`s Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> * Update packages/discord.js/src/structures/InteractionCollector.js Co-authored-by: Almeida <almeidx@pm.me> * types: revert unrelated changes Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> * Remove unneeded truey check Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> * chore: remove extra block Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> * fix: `awaitMessageComponent` with `MessageComponentInteraction`s Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> * fix: `awaitMessageComponent` with `MessageComponentInteraction`s Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> --------- Signed-off-by: RedGuy12 <61329810+RedGuy12@users.noreply.github.com> Co-authored-by: Almeida <almeidx@pm.me> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
discordjs · Jun 14, 2023 · b61e4fb · b61e4fb
1 parent d64330a
commit b61e4fb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/discord.js/src/structures/InteractionCollector.js b/packages/discord.js/src/structures/InteractionCollector.js
@@ -40,7 +40,7 @@ class InteractionCollector extends Collector {
      * The message from which to collect interactions, if provided
      * @type {?Snowflake}
      */
-    this.messageId = options.message?.id ?? null;
+    this.messageId = options.message?.id ?? options.interactionResponse?.interaction.message?.id ?? null;
 
     /**
      * The message interaction id from which to collect interactions, if provided
@@ -178,7 +178,13 @@ class InteractionCollector extends Collector {
     if (this.type && interaction.type !== this.type) return null;
     if (this.componentType && interaction.componentType !== this.componentType) return null;
     if (this.messageId && interaction.message?.id !== this.messageId) return null;
-    if (this.messageInteractionId && interaction.message?.interaction?.id !== this.messageInteractionId) return null;
+    if (
+      this.messageInteractionId &&
+      interaction.message?.interaction?.id &&
+      interaction.message.interaction.id !== this.messageInteractionId
+    ) {
+      return null;
+    }
     if (this.channelId && interaction.channelId !== this.channelId) return null;
     if (this.guildId && interaction.guildId !== this.guildId) return null;