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

Webpack build for branch 11.3-dev: 363ead922a

Browse source
This commit is contained in:
Travis CI 2018-03-02 18:21:34 +00:00
parent dd6a1cbff1
commit 6e60f9f723
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
discord.11.3-dev.js
View file

@ -5806,16 +5806,16 @@ class TextBasedChannel {
* .catch(console.error); * .catch(console.error);
*/ */
bulkDelete(messages, filterOld = false) { bulkDelete(messages, filterOld = false) {
if (messages instanceof Array || messages instanceof Collection) { if (messages instanceof Collection) messages = [...messages.values()];
let messageIDs = messages instanceof Collection ? messages.keyArray() : messages.map(m => m.id); if (messages instanceof Array) {
if (filterOld) { 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 (messages.length === 0) return new Collection();
if (messageIDs.length === 1) { if (messages.length === 1) {
return this.fetchMessage(messageIDs[0]).then(msg => msg.delete().then(() => new Collection([[msg.id, msg]]))); 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)); 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.');
@ -17507,7 +17507,6 @@ const Permissions = __webpack_require__(6);
const Constants = __webpack_require__(0); const Constants = __webpack_require__(0);
const Endpoints = Constants.Endpoints; const Endpoints = Constants.Endpoints;
const Collection = __webpack_require__(3); const Collection = __webpack_require__(3);
const Snowflake = __webpack_require__(5);
const Util = __webpack_require__(4); const Util = __webpack_require__(4);
const User = __webpack_require__(9); const User = __webpack_require__(9);
@ -17675,18 +17674,13 @@ class RESTMethods {
return this.rest.makeRequest('post', Endpoints.Guild(guild).ack, true).then(() => guild); return this.rest.makeRequest('post', Endpoints.Guild(guild).ack, true).then(() => guild);
} }
bulkDeleteMessages(channel, messages, filterOld) { bulkDeleteMessages(channel, messages) {
if (filterOld) {
messages = messages.filter(id =>
Date.now() - Snowflake.deconstruct(id).date.getTime() < 1209600000
);
}
return this.rest.makeRequest('post', Endpoints.Channel(channel).messages.bulkDelete, true, { return this.rest.makeRequest('post', Endpoints.Channel(channel).messages.bulkDelete, true, {
messages, messages: messages.map(m => m.id),
}).then(() => }).then(() =>
this.client.actions.MessageDeleteBulk.handle({ this.client.actions.MessageDeleteBulk.handle({
channel_id: channel.id, channel_id: channel.id,
ids: messages, messages,
}).messages }).messages
); );
} }
@ -20598,17 +20592,21 @@ const Constants = __webpack_require__(0);
class MessageDeleteBulkAction extends Action { class MessageDeleteBulkAction extends Action {
handle(data) { handle(data) {
const client = this.client;
const channel = client.channels.get(data.channel_id);
const ids = data.ids;
const messages = new Collection(); const messages = new Collection();
for (const id of ids) {
const message = channel.messages.get(id); if (!data.messages) {
if (message) messages.set(message.id, message); const channel = this.client.channels.get(data.channel_id);
for (const id of data.ids) {
const message = channel.messages.get(id);
if (message) messages.set(message.id, message);
}
} else {
for (const msg of data.messages) {
messages.set(msg.id, msg);
}
} }
if (messages.size > 0) client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages); if (messages.size > 0) this.client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages);
return { messages }; return { messages };
} }
} }

2
discord.11.3-dev.min.js vendored
View file

File diff suppressed because one or more lines are too long