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

Webpack build for branch 11.3-dev: b60ee25038

Browse source
This commit is contained in:
Travis CI 2018-04-19 11:25:40 +00:00
parent eb26e2e3fd
commit 085e696dea
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
discord.11.3-dev.js
View file

@ -6112,7 +6112,7 @@ class Message {
const clone = Util.cloneObject(this); const clone = Util.cloneObject(this);
this._edits.unshift(clone); this._edits.unshift(clone);
this.editedTimestamp = new Date(data.edited_timestamp).getTime(); if ('editedTimestamp' in data) this.editedTimestamp = new Date(data.edited_timestamp).getTime();
if ('content' in data) this.content = data.content; if ('content' in data) this.content = data.content;
if ('pinned' in data) this.pinned = data.pinned; if ('pinned' in data) this.pinned = data.pinned;
if ('tts' in data) this.tts = data.tts; if ('tts' in data) this.tts = data.tts;
@ -13404,10 +13404,11 @@ class MessageEmbed {
/** /**
* The hexadecimal version of the embed color, with a leading hash * The hexadecimal version of the embed color, with a leading hash
* @type {string} * @type {?string}
* @readonly * @readonly
*/ */
get hexColor() { get hexColor() {
if (!this.color) return null;
let col = this.color.toString(16); let col = this.color.toString(16);
while (col.length < 6) col = `0${col}`; while (col.length < 6) col = `0${col}`;
return `#${col}`; return `#${col}`;
@ -17671,12 +17672,13 @@ class RESTMethods {
} }
bulkDeleteMessages(channel, messages) { bulkDeleteMessages(channel, messages) {
const ids = messages.map(m => m.id);
return this.rest.makeRequest('post', Endpoints.Channel(channel).messages.bulkDelete, true, { return this.rest.makeRequest('post', Endpoints.Channel(channel).messages.bulkDelete, true, {
messages: messages.map(m => m.id), messages: ids,
}).then(() => }).then(() =>
this.client.actions.MessageDeleteBulk.handle({ this.client.actions.MessageDeleteBulk.handle({
channel_id: channel.id, channel_id: channel.id,
messages, ids,
}).messages }).messages
); );
} }
@ -18020,15 +18022,17 @@ class RESTMethods {
if (member._roles.includes(role.id)) return resolve(member); if (member._roles.includes(role.id)) return resolve(member);
const listener = (oldMember, newMember) => { const listener = (oldMember, newMember) => {
if (!oldMember._roles.includes(role.id) && newMember._roles.includes(role.id)) { if (newMember.id === member.id && !oldMember._roles.includes(role.id) && newMember._roles.includes(role.id)) {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
resolve(newMember); resolve(newMember);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener);
const timeout = this.client.setTimeout(() => const timeout = this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener), 10e3); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
reject(new Error('Adding the role timeout out.'));
}, 10e3);
return this.rest.makeRequest('put', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason) return this.rest.makeRequest('put', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason)
.catch(err => { .catch(err => {
@ -18044,15 +18048,17 @@ class RESTMethods {
if (!member._roles.includes(role.id)) return resolve(member); if (!member._roles.includes(role.id)) return resolve(member);
const listener = (oldMember, newMember) => { const listener = (oldMember, newMember) => {
if (oldMember._roles.includes(role.id) && !newMember._roles.includes(role.id)) { if (newMember.id === member.id && oldMember._roles.includes(role.id) && !newMember._roles.includes(role.id)) {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
resolve(newMember); resolve(newMember);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener); this.client.on(Constants.Events.GUILD_MEMBER_UPDATE, listener);
const timeout = this.client.setTimeout(() => const timeout = this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener), 10e3); this.client.removeListener(Constants.Events.GUILD_MEMBER_UPDATE, listener);
reject(new Error('Removing the role timeout out.'));
}, 10e3);
return this.rest.makeRequest('delete', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason) return this.rest.makeRequest('delete', Endpoints.Member(member).Role(role.id), true, undefined, undefined, reason)
.catch(err => { .catch(err => {
@ -20589,16 +20595,15 @@ const Constants = __webpack_require__(0);
class MessageDeleteBulkAction extends Action { class MessageDeleteBulkAction extends Action {
handle(data) { handle(data) {
const messages = new Collection(); const messages = new Collection();
const channel = this.client.channels.get(data.channel_id);
if (!data.messages) { if (channel) {
const channel = this.client.channels.get(data.channel_id);
for (const id of data.ids) { for (const id of data.ids) {
const message = channel.messages.get(id); const message = channel.messages.get(id);
if (message) messages.set(message.id, message); if (message) {
} messages.set(message.id, message);
} else { channel.messages.delete(id);
for (const msg of data.messages) { }
messages.set(msg.id, msg);
} }
} }

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

File diff suppressed because one or more lines are too long