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

fix(GuildEmojiManager): throw an error if image resolving fails (#3934)

Browse Source 
* fix(GuildEmojiManager): throw an error if image resolving fails

* refactor(GuildEmojiManager): remove redundant if branch
This commit is contained in:
SpaceEEC
2020-03-14 11:44:08 +01:00
committed by GitHub
parent 5b8f02243c
commit ca75eb509a
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/managers/GuildEmojiManager.js
View File

@@ -50,29 +50,28 @@ class GuildEmojiManager extends BaseManager {
* .then(emoji => console.log(`Created new emoji with name ${emoji.name}!`)) * .then(emoji => console.log(`Created new emoji with name ${emoji.name}!`))
* .catch(console.error); * .catch(console.error);
*/ */
create(attachment, name, { roles, reason } = {}) { async create(attachment, name, { roles, reason } = {}) {
if (typeof attachment === 'string' && attachment.startsWith('data:')) { attachment = await DataResolver.resolveImage(attachment);
const data = { image: attachment, name }; if (!attachment) throw new TypeError('REQ_RESOURCE_TYPE');
if (roles) {
data.roles = [];
for (let role of roles instanceof Collection ? roles.values() : roles) {
role = this.guild.roles.resolve(role);
if (!role) {
return Promise.reject(
new TypeError('INVALID_TYPE', 'options.roles', 'Array or Collection of Roles or Snowflakes', true),
);
}
data.roles.push(role.id);
}
}
return this.client.api const data = { image: attachment, name };
.guilds(this.guild.id) if (roles) {
.emojis.post({ data, reason }) data.roles = [];
.then(emoji => this.client.actions.GuildEmojiCreate.handle(this.guild, emoji).emoji); for (let role of roles instanceof Collection ? roles.values() : roles) {
role = this.guild.roles.resolve(role);
if (!role) {
return Promise.reject(
new TypeError('INVALID_TYPE', 'options.roles', 'Array or Collection of Roles or Snowflakes', true),
);
}
data.roles.push(role.id);
}
} }
return DataResolver.resolveImage(attachment).then(image => this.create(image, name, { roles, reason })); return this.client.api
.guilds(this.guild.id)
.emojis.post({ data, reason })
.then(emoji => this.client.actions.GuildEmojiCreate.handle(this.guild, emoji).emoji);
} }
/** /**