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

fix(bulkDelete): stop rejections when filterOld=true (#2178)

Browse Source 
* fix(bulkDelete): stop rejections when filterOld=true

* gus suggestion
This commit is contained in:
Isabella
2017-12-21 02:31:47 -06:00
committed by Crawl
parent 9f0417c09d
commit 6683c40a6f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ const MessageCollector = require('../MessageCollector');
const Collection = require('../../util/Collection'); const Collection = require('../../util/Collection');
const Attachment = require('../../structures/Attachment'); const Attachment = require('../../structures/Attachment');
const RichEmbed = require('../../structures/RichEmbed'); const RichEmbed = require('../../structures/RichEmbed');
const Snowflake = require('../../util/Snowflake');
const util = require('util'); const util = require('util');
/** /**
@@ -390,11 +391,18 @@ class TextBasedChannel {
* @returns {Promise<Collection<Snowflake, Message>>} Deleted messages * @returns {Promise<Collection<Snowflake, Message>>} Deleted messages
*/ */
bulkDelete(messages, filterOld = false) { bulkDelete(messages, filterOld = false) {
if (!isNaN(messages)) return this.fetchMessages({ limit: messages }).then(msgs => this.bulkDelete(msgs, filterOld));
if (messages instanceof Array || messages instanceof Collection) { if (messages instanceof Array || messages instanceof Collection) {
const messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id); let messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id);
if (filterOld) {
messageIDs = messageIDs.filter(id => Date.now() - Snowflake.deconstruct(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]])));
}
return this.client.rest.methods.bulkDeleteMessages(this, messageIDs, filterOld); return this.client.rest.methods.bulkDeleteMessages(this, messageIDs, filterOld);
} }
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.'); throw new TypeError('The messages must be an Array, Collection, or number.');
} }