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

fix(ReactionCollector): only call the filter function once (#6734)

Browse Source
This commit is contained in:
SpaceEEC
2021-10-03 15:04:37 +02:00
committed by GitHub
parent 905d100d4d
commit d15dd5f07d
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/structures/ReactionCollector.js
View File

@@ -67,6 +67,17 @@ class ReactionCollector extends Collector {
}); });
this.on('collect', (reaction, user) => { this.on('collect', (reaction, user) => {
/**
* Emitted whenever a reaction is newly created on a message. Will emit only when a new reaction is
* added to the message, as opposed to {@link Collector#collect} which which will
* be emitted even when a reaction has already been added to the message.
* @event ReactionCollector#create
* @param {MessageReaction} reaction The reaction that was added
* @param {User} user The user that added the reaction
*/
if (reaction.count === 1) {
this.emit('create', reaction, user);
}
this.total++; this.total++;
this.users.set(user.id, user); this.users.set(user.id, user);
}); });
@@ -81,10 +92,10 @@ class ReactionCollector extends Collector {
* Handles an incoming reaction for possible collection. * Handles an incoming reaction for possible collection.
* @param {MessageReaction} reaction The reaction to possibly collect * @param {MessageReaction} reaction The reaction to possibly collect
* @param {User} user The user that added the reaction * @param {User} user The user that added the reaction
* @returns {Promise<?(Snowflake|string)>} * @returns {?(Snowflake|string)}
* @private * @private
*/ */
async collect(reaction, user) { collect(reaction) {
/** /**
* Emitted whenever a reaction is collected. * Emitted whenever a reaction is collected.
* @event ReactionCollector#collect * @event ReactionCollector#collect
@@ -93,18 +104,6 @@ class ReactionCollector extends Collector {
*/ */
if (reaction.message.id !== this.message.id) return null; if (reaction.message.id !== this.message.id) return null;
/**
* Emitted whenever a reaction is newly created on a message. Will emit only when a new reaction is
* added to the message, as opposed to {@link Collector#collect} which which will
* be emitted even when a reaction has already been added to the message.
* @event ReactionCollector#create
* @param {MessageReaction} reaction The reaction that was added
* @param {User} user The user that added the reaction
*/
if (reaction.count === 1 && (await this.filter(reaction, user, this.collected))) {
this.emit('create', reaction, user);
}
return ReactionCollector.key(reaction); return ReactionCollector.key(reaction);
} }

2
typings/index.d.ts vendored
View File

@@ -1598,7 +1598,7 @@ export class ReactionCollector extends Collector<Snowflake | string, MessageReac
public static key(reaction: MessageReaction): Snowflake | string; public static key(reaction: MessageReaction): Snowflake | string;
public collect(reaction: MessageReaction, user: User): Promise<Snowflake | string | null>; public collect(reaction: MessageReaction, user: User): Snowflake | string | null;
public dispose(reaction: MessageReaction, user: User): Snowflake | string | null; public dispose(reaction: MessageReaction, user: User): Snowflake | string | null;
public empty(): void; public empty(): void;