Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: awaitMessageComponent with MessageComponentInteractions #8598

Merged
merged 13 commits into from
Jun 14, 2023
Merged

fix: awaitMessageComponent with MessageComponentInteractions #8598

Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7a6baba
fix: `awaitMessageComponent` with `MessageComponentInteraction`s
cobaltt7 Sep 5, 2022
677e247
Update packages/discord.js/src/structures/InteractionCollector.js
cobaltt7 Sep 7, 2022
65be479
types: revert unrelated changes
cobaltt7 Sep 16, 2022
6129208
Remove unneeded truey check
cobaltt7 Sep 16, 2022
048e80a
chore: remove extra block
cobaltt7 Sep 16, 2022
c1b922a
fix: `awaitMessageComponent` with `MessageComponentInteraction`s
cobaltt7 Sep 27, 2022
01ae3b3
fix: `awaitMessageComponent` with `MessageComponentInteraction`s
cobaltt7 Sep 27, 2022
b41b299
Merge branch 'main' into gh-8501
cobaltt7 Sep 28, 2022
d409b74
Merge branch 'main' into gh-8501
cobaltt7 Oct 6, 2022
36913bd
Merge branch 'main' into gh-8501
cobaltt7 Oct 10, 2022
0cfcacf
Merge branch 'main' into gh-8501
cobaltt7 Oct 11, 2022
520cbb8
Merge branch 'main' into gh-8501
cobaltt7 Nov 13, 2022
da60610
Merge branch 'main' into gh-8501
kodiakhq[bot] Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/discord.js/src/structures/InteractionCollector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 &&
cobaltt7 marked this conversation as resolved.
Show resolved Hide resolved
interaction.message?.interaction?.id !== this.messageInteractionId
cobaltt7 marked this conversation as resolved.
Show resolved Hide resolved
cobaltt7 marked this conversation as resolved.
Show resolved Hide resolved
) {
return null;
}
if (this.channelId && interaction.channelId !== this.channelId) return null;
if (this.guildId && interaction.guildId !== this.guildId) return null;

Expand All @@ -171,7 +177,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
cobaltt7 marked this conversation as resolved.
Show resolved Hide resolved
) {
return null;
}
if (this.channelId && interaction.channelId !== this.channelId) return null;
if (this.guildId && interaction.guildId !== this.guildId) return null;

Expand Down