arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-26 06:42:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update emoji type for better consitency

Browse Source
This commit is contained in:
Daniel Odendahl Jr
2017-12-06 18:56:59 +00:00
parent 604c71c02e
commit c274e132ae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/emoji.js
+4 -4
View File
@@ -1,4 +1,4 @@
const { ArgumentType, util } = require('discord.js-commando'); const { ArgumentType, util: { disambiguation } } = require('discord.js-commando');
const { escapeMarkdown } = require('discord.js'); const { escapeMarkdown } = require('discord.js');
class EmojiArgumentType extends ArgumentType { class EmojiArgumentType extends ArgumentType {
@@ -18,7 +18,7 @@ class EmojiArgumentType extends ArgumentType {
if (exactEmojis.length === 1) return true; if (exactEmojis.length === 1) return true;
if (exactEmojis.length > 0) emojis = exactEmojis; if (exactEmojis.length > 0) emojis = exactEmojis;
return emojis.length <= 15 return emojis.length <= 15
? `${util.disambiguation(emojis.map(emoji => escapeMarkdown(emoji.name)), 'emojis', null)}\n` ? `${disambiguation(emojis.map(emoji => escapeMarkdown(emoji.name)), 'emojis', null)}\n`
: 'Multiple emojis found. Please be more specific.'; : 'Multiple emojis found. Please be more specific.';
} }
@@ -26,10 +26,10 @@ class EmojiArgumentType extends ArgumentType {
const matches = value.match(/^(?:<:([a-zA-Z0-9_]+):)?([0-9]+)>?$/); const matches = value.match(/^(?:<:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
if (matches) return msg.client.emojis.get(matches[2]) || null; if (matches) return msg.client.emojis.get(matches[2]) || null;
const search = value.toLowerCase(); const search = value.toLowerCase();
const emojis = msg.guild.emojis.filterArray(emoji => emoji.name.toLowerCase().includes(search)); const emojis = msg.guild.emojis.filterArray(nameFilterInexact(search));
if (!emojis.length) return null; if (!emojis.length) return null;
if (emojis.length === 1) return emojis[0]; if (emojis.length === 1) return emojis[0];
const exactEmojis = msg.guild.emojis.filterArray(emoji => emoji.name.toLowerCase() === search); const exactEmojis = emojis.filterArray(nameFilterExact(search));
if (exactEmojis.length === 1) return exactEmojis[0]; if (exactEmojis.length === 1) return exactEmojis[0];
return null; return null;
} }