fix: awaitMessageComponent with MessageComponentInteractions

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?.message?.id ?? null;
 
     /**
      * The message interaction id from which to collect interactions, if provided
@@ -150,7 +150,13 @@ class InteractionCollector extends Collector {
     if (this.interactionType && interaction.type !== this.interactionType) 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;
 

packages/discord.js/src/structures/InteractionResponse.js

@@ -10,7 +10,7 @@ class InteractionResponse {
   constructor(interaction, id) {
     /**
      * The interaction associated with the interaction response
-     * @type {BaseInteraction}
+     * @type {CommandInteraction|MessageComponentInteraction|ModalSubmitInteraction}
      */
     this.interaction = interaction;
     /**

packages/discord.js/typings/index.d.ts

@@ -483,7 +483,7 @@ export abstract class CommandInteraction<Cached extends CacheType = CacheType> e
 }
 
 export class InteractionResponse<Cached extends boolean = boolean> {
-  private constructor(interaction: Interaction, id?: Snowflake);
+  private constructor(interaction: Exclude<Interaction, AutocompleteInteraction>, id?: Snowflake);
   public interaction: Interaction<WrapBooleanCache<Cached>>;
   public client: Client;
   public id: Snowflake;