Update custom emoji type

This commit is contained in:
Daniel Odendahl Jr
2018-12-22 14:14:30 +00:00
parent 0c2c4f8e5d
commit ff9dd5f486
3 changed files with 2 additions and 46 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ module.exports = class EmojiImageCommand extends Command {
{
key: 'emoji',
prompt: 'Which emoji would you like to get the image of?',
type: 'emoji'
type: 'custom-emoji'
}
]
});
+1 -1
View File
@@ -16,7 +16,7 @@ module.exports = class EmojiCommand extends Command {
{
key: 'emoji',
prompt: 'Which emoji would you like to get information on?',
type: 'emoji'
type: 'custom-emoji'
}
]
});
-44
View File
@@ -1,44 +0,0 @@
const { ArgumentType, util: { disambiguation } } = require('discord.js-commando');
const { escapeMarkdown } = require('discord.js');
module.exports = class EmojiArgumentType extends ArgumentType {
constructor(client) {
super(client, 'emoji');
}
validate(value, msg) {
const matches = value.match(/^(?:<a?:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
if (matches && msg.client.emojis.has(matches[2])) return true;
if (!msg.guild) return false;
const search = value.toLowerCase();
let emojis = msg.guild.emojis.filter(nameFilterInexact(search));
if (!emojis.size) return false;
if (emojis.size === 1) return true;
const exactEmojis = emojis.filter(nameFilterExact(search));
if (exactEmojis.size === 1) return true;
if (exactEmojis.size > 0) emojis = exactEmojis;
return emojis.size <= 15
? `${disambiguation(emojis.map(emoji => escapeMarkdown(emoji.name)), 'emojis', null)}\n`
: 'Multiple emojis found. Please be more specific.';
}
parse(value, msg) {
const matches = value.match(/^(?:<a?:([a-zA-Z0-9_]+):)?([0-9]+)>?$/);
if (matches) return msg.client.emojis.get(matches[2]) || null;
const search = value.toLowerCase();
const emojis = msg.guild.emojis.filter(nameFilterInexact(search));
if (!emojis.size) return null;
if (emojis.size === 1) return emojis.first();
const exactEmojis = emojis.filter(nameFilterExact(search));
if (exactEmojis.size === 1) return exactEmojis.first();
return null;
}
};
function nameFilterExact(search) {
return thing => thing.name.toLowerCase() === search;
}
function nameFilterInexact(search) {
return thing => thing.name.toLowerCase().includes(search);
}