dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-27 22:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

backport: TextChannel#bulkDelete accepts Snowflake[]

Browse source
This commit is contained in:
Lewdcario 2018-08-08 17:14:52 -05:00
parent af6d649510
commit c76f3048af
No known key found for this signature in database
GPG key ID: 6FCE946CE72C1D94
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/rest/RESTMethods.js
View file

@ -179,13 +179,12 @@ class RESTMethods {
}
bulkDeleteMessages(channel, messages) {
const ids = messages.map(m => m.id);
return this.rest.makeRequest('post', Endpoints.Channel(channel).messages.bulkDelete, true, {
messages: ids,
messages: messages,
}).then(() =>
this.client.actions.MessageDeleteBulk.handle({
channel_id: channel.id,
ids,
ids: messages,
}).messages
);
}

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

@ -452,7 +452,8 @@ class TextBasedChannel {
/**
* Bulk delete given messages that are newer than two weeks.
* <warn>This is only available when using a bot account.</warn>
* @param {Collection<Snowflake, Message>|Message[]|number} messages Messages or number of messages to delete
* @param {Collection<Snowflake, Message>|Message[]|Snowflake[]|number} messages
* Messages or number of messages to delete
* @param {boolean} [filterOld=false] Filter messages to remove those which are older than two weeks automatically
* @returns {Promise<Collection<Snowflake, Message>>} Deleted messages
* @example
@ -462,16 +463,16 @@ class TextBasedChannel {
* .catch(console.error);
*/
bulkDelete(messages, filterOld = false) {
if (messages instanceof Collection) messages = [...messages.values()];
if (messages instanceof Array) {
if (messages instanceof Array || messages instanceof Collection) {
let messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id || m);
if (filterOld) {
messages = messages.filter(m => Date.now() - Snowflake.deconstruct(m.id).date.getTime() < 1209600000);
messageIDs = messageIDs.filter(id => Date.now() - Snowflake.deconstruct(id).date.getTime() < 1209600000);
}
if (messages.length === 0) return Promise.resolve(new Collection());
if (messages.length === 1) {
return messages[0].delete().then(() => new Collection([[messages[0].id, messages[0]]]));
if (messageIDs.length === 0) return Promise.resolve(new Collection());
if (messageIDs.length === 1) {
return this.fetchMessage(messageIDs[0]).then(m => m.delete()).then(m => new Collection([[m.id, m]]));
}
return this.client.rest.methods.bulkDeleteMessages(this, messages);
return this.client.rest.methods.bulkDeleteMessages(this, messageIDs);
}
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.');