dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-07 16:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(TextChannel#bulkDelete): use GenericAction#getMessage to handle return value correctly (#3664)

Browse source 
* Corrected the handling of the action

* Apply same fix to handling of single message in bulkDelete

* Revert to using await
This commit is contained in:
Ryan Munro 2020-01-26 01:27:39 +11:00 committed by SpaceEEC
parent 3ea9ac57dd
commit d8b4725caa
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/structures/interfaces/TextBasedChannel.js
View file

@ -306,19 +306,16 @@ class TextBasedChannel {
if (messageIDs.length === 0) return new Collection(); if (messageIDs.length === 0) return new Collection();
if (messageIDs.length === 1) { if (messageIDs.length === 1) {
await this.client.api.channels(this.id).messages(messageIDs[0]).delete(); await this.client.api.channels(this.id).messages(messageIDs[0]).delete();
const message = this.client.actions.MessageDelete.handle({ const message = this.client.actions.MessageDelete.getMessage({
channel_id: this.id, message_id: messageIDs[0],
id: messageIDs[0], }, this);
}).message; return message ? new Collection([[message.id, message]]) : new Collection();
if (message) return new Collection([[message.id, message]]);
return new Collection();
} }
await this.client.api.channels[this.id].messages['bulk-delete'] await this.client.api.channels[this.id].messages['bulk-delete']
.post({ data: { messages: messageIDs } }); .post({ data: { messages: messageIDs } });
return this.client.actions.MessageDeleteBulk.handle({ return messageIDs.reduce((col, id) => col.set(id, this.client.actions.MessageDeleteBulk.getMessage({
channel_id: this.id, message_id: id,
ids: messageIDs, }, this)), new Collection());
}).messages;
} }
if (!isNaN(messages)) { if (!isNaN(messages)) {
const msgs = await this.messages.fetch({ limit: messages }); const msgs = await this.messages.fetch({ limit: messages });