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

Webpack build for branch master: c4fecf6609

Browse source
This commit is contained in:
Travis CI 2017-08-27 22:14:59 +00:00
parent cf22568a09
commit 7cc40f5f9c
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
discord.master.js
View file

@ -7471,11 +7471,8 @@ class Guild extends Base {
.then(emoji => this.client.actions.GuildEmojiCreate.handle(this, emoji).emoji);
}
return this.client.resolver.resolveFile(attachment)
.then(data => {
const dataURI = this.client.resolver.resolveBase64(data);
return this.createEmoji(dataURI, name, { roles, reason });
});
return this.client.resolver.resolveImage(attachment)
.then(image => this.createEmoji(image, name, { roles, reason }));
}
/**
@ -7964,10 +7961,9 @@ class Webhook {
*/
edit({ name = this.name, avatar }, reason) {
if (avatar && (typeof avatar === 'string' && !avatar.startsWith('data:'))) {
return this.client.resolver.resolveFile(avatar).then(file => {
const dataURI = this.client.resolver.resolveBase64(file);
return this.edit({ name, avatar: dataURI }, reason);
});
return this.client.resolver.resolveImage(avatar).then(image =>
this.edit({ name, avatar: image }, reason)
);
}
return this.client.api.webhooks(this.id, this.token).patch({
data: { name, avatar },
@ -13721,23 +13717,23 @@ class TextChannel extends GuildChannel {
/**
* Create a webhook for the channel.
* @param {string} name The name of the webhook
* @param {BufferResolvable|Base64Resolvable} avatar The avatar for the webhook
* @param {string} [reason] Reason for creating this webhook
* @param {Object} [options] Options for creating the webhook
* @param {BufferResolvable|Base64Resolvable} [options.avatar] Avatar for the webhook
* @param {string} [options.reason] Reason for creating the webhook
* @returns {Promise<Webhook>} webhook The created webhook
* @example
* channel.createWebhook('Snek', 'https://i.imgur.com/mI8XcpG.jpg')
* .then(webhook => console.log(`Created webhook ${webhook}`))
* .catch(console.error)
*/
createWebhook(name, avatar, reason) {
createWebhook(name, { avatar, reason } = {}) {
if (typeof avatar === 'string' && avatar.startsWith('data:')) {
return this.client.api.channels[this.id].webhooks.post({ data: {
name, avatar,
}, reason }).then(data => new Webhook(this.client, data));
} else {
return this.client.resolver.resolveFile(avatar).then(data =>
this.createWebhook(name, this.client.resolver.resolveBase64(data) || null));
}
return this.client.resolver.resolveImage(avatar).then(image =>
this.createWebhook(name, { avatar: image, reason }));
}
// These are here only for documentation purposes - they are implemented by TextBasedChannel
@ -17440,10 +17436,10 @@ class ClientUser extends User {
return undefined;
}, reject)
);
} else {
return this.client.resolver.resolveFile(icon)
.then(data => this.createGuild(name, { region, icon: this.client.resolver.resolveBase64(data) || null }));
}
return this.client.resolver.resolveImage(icon)
.then(data => this.createGuild(name, { region, icon: data || null }));
}
/**

2
discord.master.min.js vendored
View file

File diff suppressed because one or more lines are too long