Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-13 10:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Handle message bulk delete and thread delete in collectors (#6902)

Browse Source
This commit is contained in:
Jiralite
2021-10-29 13:58:31 +01:00
committed by GitHub
parent 14716df6b6
commit d6685b1c50
3 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/structures/InteractionCollector.js
View File

@@ -19,7 +19,8 @@ const { InteractionTypes, MessageComponentTypes } = require('../util/Constants')
/**
* Collects interactions.
* Will automatically stop if the message ({@link Client#event:messageDelete messageDelete}),
* Will automatically stop if the message ({@link Client#event:messageDelete messageDelete} or
* {@link Client#event:messageDeleteBulk messageDeleteBulk}),
* channel ({@link Client#event:channelDelete channelDelete}), or
* guild ({@link Client#event:guildDelete guildDelete}) is deleted.
* <info>Interaction collectors that do not specify `time` or `idle` may be prone to always running.
@@ -92,9 +93,14 @@ class InteractionCollector extends Collector {
this.empty = this.empty.bind(this);
this.client.incrementMaxListeners();
const bulkDeleteListener = messages => {
if (messages.has(this.messageId)) this.stop('messageDelete');
};
if (this.messageId) {
this._handleMessageDeletion = this._handleMessageDeletion.bind(this);
this.client.on(Events.MESSAGE_DELETE, this._handleMessageDeletion);
this.client.on(Events.MESSAGE_BULK_DELETE, bulkDeleteListener);
}
if (this.channelId) {
@@ -112,6 +118,7 @@ class InteractionCollector extends Collector {
this.once('end', () => {
this.client.removeListener(Events.INTERACTION_CREATE, this.handleCollect);
this.client.removeListener(Events.MESSAGE_DELETE, this._handleMessageDeletion);
this.client.removeListener(Events.MESSAGE_BULK_DELETE, bulkDeleteListener);
this.client.removeListener(Events.CHANNEL_DELETE, this._handleChannelDeletion);
this.client.removeListener(Events.GUILD_DELETE, this._handleGuildDeletion);
this.client.decrementMaxListeners();