choice argument type

assets/json/currency.json

@@ -1,34 +1,34 @@
 [
-	"AUD",
+	"aud",
-	"USD",
+	"usd",
-	"BGN",
+	"bgn",
-	"BRL",
+	"brl",
-	"CAD",
+	"cad",
-	"CHF",
+	"chf",
-	"CNY",
+	"cny",
-	"CZK",
+	"czk",
-	"DKK",
+	"dkk",
-	"GBP",
+	"gbp",
-	"HKD",
+	"hkd",
-	"HRK",
+	"hrk",
-	"HUF",
+	"huf",
-	"IDR",
+	"idr",
-	"ILS",
+	"ils",
-	"INR",
+	"inr",
-	"JPY",
+	"jpy",
-	"KRW",
+	"krw",
-	"MXN",
+	"mxn",
-	"MYR",
+	"myr",
-	"NOK",
+	"nok",
-	"NZD",
+	"nzd",
-	"PHP",
+	"php",
-	"PLN",
+	"pln",
-	"RON",
+	"ron",
-	"RUB",
+	"rub",
-	"SEK",
+	"sek",
-	"SGD",
+	"sgd",
-	"THB",
+	"thb",
-	"TRY",
+	"try",
-	"ZAR",
+	"zar",
-	"EUR"
+	"eur"
 ]

commands/avatar-edit/hat.js

@@ -22,12 +22,8 @@ module.exports = class HatCommand extends Command {
 				{
 					key: 'type',
 					prompt: `What type of hat would you like to use? Either ${list(hats, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: type => {
+					choices: hats
-						if (hats.includes(type.toLowerCase())) return true;
-						return `Invalid type, please enter either ${list(hats, 'or')}.`;
-					},
-					parse: type => type.toLowerCase()
 				},
 				{
 					key: 'user',

commands/events/horoscope.js

@@ -17,12 +17,8 @@ module.exports = class HoroscopeCommand extends Command {
 				{
 					key: 'sign',
 					prompt: `Which sign would you like to get the horoscope for? Either ${list(signs, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: sign => {
+					choices: signs
-						if (signs.includes(sign.toLowerCase())) return true;
-						return `Invalid sign, please enter either ${list(signs, 'or')}.`;
-					},
-					parse: sign => sign.toLowerCase()
 				}
 			]
 		});

commands/games/math-quiz.js

@@ -24,12 +24,8 @@ module.exports = class MathQuizCommand extends Command {
 				{
 					key: 'difficulty',
 					prompt: `What should the difficulty of the game be? Either ${list(difficulties, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: difficulty => {
+					choices: difficulties
-						if (difficulties.includes(difficulty.toLowerCase())) return true;
-						return `Invalid difficulty, please enter either ${list(difficulties, 'or')}.`;
-					},
-					parse: difficulty => difficulty.toLowerCase()
 				}
 			]
 		});

commands/games/quiz.js

@@ -22,24 +22,16 @@ module.exports = class QuizCommand extends Command {
 				{
 					key: 'type',
 					prompt: `Which type of question would you like to have? Either ${list(types, 'or')}.`,
-					type: 'string',
+					type: 'choice',
 					default: 'multiple',
-					validate: type => {
+					choices: types
-						if (types.includes(type.toLowerCase())) return true;
-						return `Invalid type, please enter either ${list(types, 'or')}.`;
-					},
-					parse: type => type.toLowerCase()
 				},
 				{
 					key: 'difficulty',
 					prompt: `What should the difficulty of the game be? Either ${list(difficulties, 'or')}.`,
-					type: 'string',
+					type: 'choice',
 					default: '',
-					validate: difficulty => {
+					choices: difficulties
-						if (difficulties.includes(difficulty.toLowerCase())) return true;
-						return `Invalid difficulty, please enter either ${list(difficulties, 'or')}.`;
-					},
-					parse: difficulty => difficulty.toLowerCase()
 				}
 			]
 		});

commands/games/rock-paper-scissors.js

@@ -13,8 +13,8 @@ module.exports = class RockPaperScissorsCommand extends Command {
 				{
 					key: 'choice',
 					prompt: 'Rock, Paper, or Scissors?',
-					type: 'string',
+					type: 'choice',
-					parse: choice => choice.toLowerCase()
+					choices
 				}
 			]
 		});

commands/games/typing-test.js

@@ -24,12 +24,8 @@ module.exports = class TypingTestCommand extends Command {
 				{
 					key: 'difficulty',
 					prompt: `What should the difficulty of the game be? Either ${list(difficulties, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: difficulty => {
+					choices: difficulties
-						if (difficulties.includes(difficulty.toLowerCase())) return true;
-						return `Invalid difficulty, please enter either ${list(difficulties, 'or')}.`;
-					},
-					parse: difficulty => difficulty.toLowerCase()
 				}
 			]
 		});

commands/info/channel.js

@@ -33,7 +33,7 @@ module.exports = class ChannelInfoCommand extends Command {
 		const embed = new MessageEmbed()
 			.setColor(0x00AE86)
 			.addField('❯ Name',
-				channel.name || 'None', true)
+				channel.type !== 'dm' ? channel.name : `@${channel.recipient.username}`, true)
 			.addField('❯ ID',
 				channel.id, true)
 			.addField('❯ NSFW',

commands/info/emoji-list.js

@@ -15,13 +15,9 @@ module.exports = class EmojiListCommand extends Command {
 				{
 					key: 'type',
 					prompt: `What type of emoji would you like to view? Either ${list(types, 'or')}.`,
-					type: 'string',
+					type: 'choice',
 					default: 'regular',
-					validate: type => {
+					choices: types
-						if (types.includes(type.toLowerCase())) return true;
-						return `Invalid type, please enter either ${list(types, 'or')}.`;
-					},
-					parse: type => type.toLowerCase()
 				}
 			]
 		});

commands/number-edit/currency.js

@@ -16,22 +16,14 @@ module.exports = class CurrencyCommand extends Command {
 				{
 					key: 'base',
 					prompt: `What currency code do you want to use as the base? Either ${list(codes, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: base => {
+					choices: codes
-						if (codes.includes(base.toUpperCase())) return true;
-						return `Invalid base, please enter either ${list(codes, 'or')}.`;
-					},
-					parse: base => base.toUpperCase()
 				},
 				{
 					key: 'target',
 					prompt: `What currency code do you want to convert to? Either ${list(codes, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: target => {
+					choices: codes
-						if (codes.includes(target.toUpperCase())) return true;
-						return `Invalid target, please enter either ${list(codes, 'or')}.`;
-					},
-					parse: target => target.toUpperCase()
 				},
 				{
 					key: 'amount',

commands/random/name.js

@@ -15,13 +15,9 @@ module.exports = class NameCommand extends Command {
 				{
 					key: 'gender',
 					prompt: `Which gender do you want to generate a name for? Either ${list(genders, 'or')}.`,
-					type: 'string',
+					type: 'choice',
 					default: 'both',
-					validate: gender => {
+					choices: genders
-						if (genders.includes(gender.toLowerCase())) return true;
-						return `Invalid gender, please enter either ${list(genders, 'or')}.`;
-					},
-					parse: gender => gender.toLowerCase()
 				}
 			]
 		});

commands/search/deviantart.js

@@ -16,12 +16,8 @@ module.exports = class DeviantartCommand extends Command {
 				{
 					key: 'section',
 					prompt: `What section would you like to search? Either ${list(sections, 'or')}.`,
-					type: 'string',
+					type: 'choice',
-					validate: section => {
+					choices: sections
-						if (sections.includes(section.toLowerCase())) return true;
-						return `Invalid section, please enter either ${list(sections, 'or')}.`;
-					},
-					parse: section => section.toLowerCase()
 				},
 				{
 					key: 'query',

commands/search/urban-dictionary.js

@@ -1,7 +1,7 @@
 const { Command } = require('discord.js-commando');
 const { MessageEmbed } = require('discord.js');
 const snekfetch = require('snekfetch');
-const { shorten, list } = require('../../util/Util');
+const { shorten } = require('../../util/Util');
 const types = ['random', 'top'];
 
 module.exports = class UrbanDictionaryCommand extends Command {
@@ -23,13 +23,9 @@ module.exports = class UrbanDictionaryCommand extends Command {
 				{
 					key: 'type',
 					prompt: 'Do you want to get the top answer or a random one?',
-					type: 'string',
+					type: 'choice',
 					default: 'top',
-					validate: type => {
+					choices: types
-						if (types.includes(type.toLowerCase())) return true;
-						return `Invalid type, please enter either ${list(types, 'or')}.`;
-					},
-					parse: type => type.toLowerCase()
 				}
 			]
 		});

commands/text-edit/base64.js

@@ -15,12 +15,8 @@ module.exports = class Base64Command extends Command {
 				{
 					key: 'mode',
 					prompt: `Would you like to ${list(modes, 'or')}?`,
-					type: 'string',
+					type: 'choice',
-					validate: mode => {
+					choices: modes
-						if (modes.includes(mode.toLowerCase())) return true;
-						return `Invalid mode, please enter either ${list(modes, 'or')}.`;
-					},
-					parse: mode => mode.toLowerCase()
 				},
 				{
 					key: 'text',

commands/text-edit/binary.js

@@ -14,12 +14,8 @@ module.exports = class BinaryCommand extends Command {
 				{
 					key: 'mode',
 					prompt: `Would you like to ${list(modes, 'or')}?`,
-					type: 'string',
+					type: 'choice',
-					validate: mode => {
+					choices: modes
-						if (modes.includes(mode.toLowerCase())) return true;
-						return `Invalid mode, please enter either ${list(modes, 'or')}.`;
-					},
-					parse: mode => mode.toLowerCase()
 				},
 				{
 					key: 'text',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "69.0.0",
+	"version": "69.0.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {

types/choice.js

@@ -0,0 +1,19 @@
+const { ArgumentType } = require('discord.js-commando');
+const { list } = require('../util/Util');
+
+class ChoiceArgumentType extends ArgumentType {
+	constructor(client) {
+		super(client, 'choice');
+	}
+
+	validate(value, msg, arg) {
+		if (arg.choices.includes(value.toLowerCase())) return true;
+		return `Invalid ${arg.label}, please enter either ${list(arg.choices, 'or')}.`;
+	}
+
+	parse(value) {
+		return value.toLowerCase();
+	}
+}
+
+module.exports = ChoiceArgumentType;