From d8b4725caa2e188e16c94f20ff7b3e5b821589ad Mon Sep 17 00:00:00 2001 From: Ryan Munro Date: Sun, 26 Jan 2020 01:27:39 +1100 Subject: [PATCH] fix(TextChannel#bulkDelete): use GenericAction#getMessage to handle return value correctly (#3664) * Corrected the handling of the action * Apply same fix to handling of single message in bulkDelete * Revert to using await --- src/structures/interfaces/TextBasedChannel.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/structures/interfaces/TextBasedChannel.js b/src/structures/interfaces/TextBasedChannel.js index 634dff33a..a6b183753 100644 --- a/src/structures/interfaces/TextBasedChannel.js +++ b/src/structures/interfaces/TextBasedChannel.js @@ -306,19 +306,16 @@ class TextBasedChannel { if (messageIDs.length === 0) return new Collection(); if (messageIDs.length === 1) { await this.client.api.channels(this.id).messages(messageIDs[0]).delete(); - const message = this.client.actions.MessageDelete.handle({ - channel_id: this.id, - id: messageIDs[0], - }).message; - if (message) return new Collection([[message.id, message]]); - return new Collection(); + const message = this.client.actions.MessageDelete.getMessage({ + message_id: messageIDs[0], + }, this); + return message ? new Collection([[message.id, message]]) : new Collection(); } await this.client.api.channels[this.id].messages['bulk-delete'] .post({ data: { messages: messageIDs } }); - return this.client.actions.MessageDeleteBulk.handle({ - channel_id: this.id, - ids: messageIDs, - }).messages; + return messageIDs.reduce((col, id) => col.set(id, this.client.actions.MessageDeleteBulk.getMessage({ + message_id: id, + }, this)), new Collection()); } if (!isNaN(messages)) { const msgs = await this.messages.fetch({ limit: messages });