Webpack build for branch master: 40c610987e

This commit is contained in:
Travis CI 2017-04-12 04:34:05 +00:00
parent 87cda7ca78
commit 3fcda6a1b8
2 changed files with 11 additions and 8 deletions

View file

@ -11574,21 +11574,24 @@ class ClientDataResolver {
/** /**
* Data that can be resolved to give an emoji identifier. This can be: * Data that can be resolved to give an emoji identifier. This can be:
* * A string * * The unicode representation of an emoji
* * An Emoji * * A custom emoji ID
* * A ReactionEmoji * * An Emoji object
* * A ReactionEmoji object
* @typedef {string|Emoji|ReactionEmoji} EmojiIdentifierResolvable * @typedef {string|Emoji|ReactionEmoji} EmojiIdentifierResolvable
*/ */
/** /**
* Resolves an EmojiResolvable to an emoji identifier * Resolves an EmojiResolvable to an emoji identifier
* @param {EmojiIdentifierResolvable} emoji The emoji resolvable to resolve * @param {EmojiIdentifierResolvable} emoji The emoji resolvable to resolve
* @returns {string} * @returns {?string}
*/ */
resolveEmojiIdentifier(emoji) { resolveEmojiIdentifier(emoji) {
if (emoji instanceof Emoji || emoji instanceof ReactionEmoji) return emoji.identifier; if (emoji instanceof Emoji || emoji instanceof ReactionEmoji) return emoji.identifier;
if (typeof emoji === 'string') { if (typeof emoji === 'string') {
if (!emoji.includes('%')) return encodeURIComponent(emoji); if (!isNaN(parseInt(emoji))) return this.client.emojis.get(emoji).identifier;
else if (!emoji.includes('%')) return encodeURIComponent(emoji);
else return emoji;
} }
return null; return null;
} }

File diff suppressed because one or more lines are too long