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

fix: bulkDelete discarding non-cached messages

Browse Source
This commit is contained in:
Lewdcario
2018-03-02 12:17:10 -06:00
parent 96e88f3cef
commit 363ead922a
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/structures/interfaces/TextBasedChannel.js
View File

@@ -435,16 +435,16 @@ class TextBasedChannel {
* .catch(console.error);
*/
bulkDelete(messages, filterOld = false) {
if (messages instanceof Array || messages instanceof Collection) {
let messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id);
if (messages instanceof Collection) messages = [...messages.values()];
if (messages instanceof Array) {
if (filterOld) {
messageIDs = messageIDs.filter(id => Date.now() - Snowflake.deconstruct(id).date.getTime() < 1209600000);
messages = messages.filter(m => Date.now() - Snowflake.deconstruct(m.id).date.getTime() < 1209600000);
}
if (messageIDs.length === 0) return new Collection();
if (messageIDs.length === 1) {
return this.fetchMessage(messageIDs[0]).then(msg => msg.delete().then(() => new Collection([[msg.id, msg]])));
if (messages.length === 0) return new Collection();
if (messages.length === 1) {
return messages[0].delete().then(() => new Collection([[messages[0].id, messages[0]]]));
}
return this.client.rest.methods.bulkDeleteMessages(this, messageIDs, filterOld);
return this.client.rest.methods.bulkDeleteMessages(this, messages);
}
if (!isNaN(messages)) return this.fetchMessages({ limit: messages }).then(msgs => this.bulkDelete(msgs, filterOld));
throw new TypeError('The messages must be an Array, Collection, or number.');