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

fix(GuildEmoji): added a check for managed emojis in fetchAuthor (#2645)

Browse Source
This commit is contained in:
Yukine
2018-07-26 03:11:38 +02:00
committed by Isabella
parent c46cbbfd84
commit f963621ef1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/errors/Messages.js
View File

@@ -94,6 +94,7 @@ const Messages = {
WEBHOOK_MESSAGE: 'The message was not sent by a webhook.', WEBHOOK_MESSAGE: 'The message was not sent by a webhook.',
EMOJI_TYPE: 'Emoji must be a string or GuildEmoji/ReactionEmoji', EMOJI_TYPE: 'Emoji must be a string or GuildEmoji/ReactionEmoji',
EMOJI_MANAGED: 'Emoji is managed and has no Author.',
REACTION_RESOLVE_USER: 'Couldn\'t resolve the user ID to remove from the reaction.', REACTION_RESOLVE_USER: 'Couldn\'t resolve the user ID to remove from the reaction.',
}; };

4
src/structures/GuildEmoji.js
View File

@@ -1,5 +1,6 @@
const GuildEmojiRoleStore = require('../stores/GuildEmojiRoleStore'); const GuildEmojiRoleStore = require('../stores/GuildEmojiRoleStore');
const Permissions = require('../util/Permissions'); const Permissions = require('../util/Permissions');
const { Error } = require('../errors');
const Snowflake = require('../util/Snowflake'); const Snowflake = require('../util/Snowflake');
const Emoji = require('./Emoji'); const Emoji = require('./Emoji');
@@ -87,6 +88,9 @@ class GuildEmoji extends Emoji {
* @returns {Promise<User>} * @returns {Promise<User>}
*/ */
fetchAuthor() { fetchAuthor() {
if (this.managed) {
return Promise.reject(new Error('EMOJI_MANAGED'));
}
return this.client.api.guilds(this.guild.id).emojis(this.id).get() return this.client.api.guilds(this.guild.id).emojis(this.id).get()
.then(emoji => this.client.users.add(emoji.user)); .then(emoji => this.client.users.add(emoji.user));
} }