Validators Added for all Commands

commands/textedit/morse.js

@@ -15,7 +15,13 @@ module.exports = class MorseCommand extends commando.Command {
             args: [{
                 key: 'method',
                 prompt: 'Would you like to encode or decode the text?',
-                type: 'string'
+                type: 'string',
+                validate: method => {
+                    if (method.toLowerCase() === 'encode' || method.toLowerCase() === 'decode') {
+                        return true;
+                    }
+                    return 'Please enter either `encode` or `decode`.'
+                }
             }, {
                 key: 'text',
                 prompt: 'What text would you like to convert to morse?',
@@ -29,10 +35,13 @@ module.exports = class MorseCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return;
         }
         console.log(`[Command] ${message.content}`);
-        let methodToUse = args.method;
-        if (methodToUse.toLowerCase() !== 'encode' || methodToUse.toLowerCase() !== 'decode') return message.channel.send(':x: Error! Please set either encode or decode!');
+        let methodToUse = args.method.toLowerCase();
         let toMorse = args.text;
-        if (methodToUse === 'encode') return message.channel.send(morse.encode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?'));
-        if (methodToUse === 'decode') return message.channel.send(morse.decode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?'));
+        if (methodToUse === 'encode') {
+            return message.channel.send(morse.encode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?'));
+        }
+        else if (methodToUse === 'decode') {
+            return message.channel.send(morse.decode(toMorse)).catch(error => message.channel.send(':x: Error! Something went wrong! Perhaps you entered incorrect text?'));
+        }
     }
 };

commands/textedit/romaji.js

@@ -15,7 +15,13 @@ module.exports = class RomajiCommand extends commando.Command {
             args: [{
                 key: 'kana',
                 prompt: 'What kana would you like to convert to romaji?',
-                type: 'string'
+                type: 'string',
+                validate: kana => {
+                    if (hepburn.containsKana(kana)) {
+                        return true;
+                    }
+                    return 'Please enter text in either Hiragana or Katakana.';
+                }
             }]
         });
     }
@@ -26,7 +32,6 @@ module.exports = class RomajiCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let romajify = args.kana;
-        if (!hepburn.containsKana(romajify)) return message.channel.send(':x: Error! Message contains no Katakana or Hiragana!');
         let romajified = hepburn.fromKana(romajify);
         if (romajified.length > 1950) return message.channel.send(":x: Error! Your message is too long!");
         return message.channel.send(romajified);

commands/textedit/translate.js

@@ -120,11 +120,23 @@ module.exports = class TranslateCommand extends commando.Command {
             args: [{
                 key: 'to',
                 prompt: 'What language would you like to translate to?',
-                type: 'string'
+                type: 'string',
+                validate: to => {
+                    if (languages[to.toLowerCase()] || to.toLowerCase() === 'list') {
+                        return true;
+                    }
+                    return 'Please enter a valid language code. Enter `list` for a list of codes.';
+                }
             }, {
                 key: 'text',
                 prompt: 'What text would you like to translate?',
-                type: 'string'
+                type: 'string',
+                validate: content => {
+                    if (content.length > 200) {
+                        return 'Please keep translation queries under 200 characters.';
+                    }
+                    return true;
+                }
             }]
         });
     }
@@ -134,11 +146,9 @@ module.exports = class TranslateCommand extends commando.Command {
             if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES', 'EMBED_LINKS'])) return;
         }
         console.log(`[Command] ${message.content}`);
-        let languageto = args.to;
-        if (!languages[languageto] || languageto.toLowerCase() !== 'list') return message.channel.send(':x: Error! Translation type is not valid!');
+        let languageto = args.to.toLowerCase();
         let thingToTranslate = args.text;
         if (languageto === "list") return message.channel.send("‘af': 'Afrikaans’\n’sq': 'Albanian'\n'ar': 'Arabic’\n’hy': 'Armenian’\n’az': 'Azerbaijani’\n’eu': 'Basque’\n’be': 'Belarusian’\n’bn': 'Bengali’\n’bs': 'Bosnian’\n’bg': 'Bulgarian’\n’ca': 'Catalan’\n’ceb': 'Cebuano’\n’ny': 'Chichewa’\n’zh-cn': 'Chinese Simplified’\n’zh-tw': 'Chinese Traditional’\n’co': 'Corsican’\n’hr': 'Croatian’\n’cs': 'Czech’\n’da': 'Danish’\n’nl': 'Dutch’\n’en': 'English’\n’eo': 'Esperanto’\n’et': 'Estonian’\n’tl': 'Filipino’\n’fi': 'Finnish’\n’fr': 'French’\n’fy': 'Frisian’\n’gl': 'Galician’\n’ka': 'Georgian’\n’de': 'German’\n’el': 'Greek’\n’gu': 'Gujarati’\n’ht': 'Haitian Creole’\n’ha': 'Hausa’\n’haw': 'Hawaiian’\n’iw': 'Hebrew’\n’hi': 'Hindi’\n’hmn': 'Hmong’\n’hu': 'Hungarian’\n’is': 'Icelandic’\n’ig': 'Igbo’\n’id': 'Indonesian’\n’ga': 'Irish’\n’it': 'Italian’\n’ja': 'Japanese’\n’jw': 'Javanese’\n’kn': 'Kannada’\n’kk': 'Kazakh’\n’km': 'Khmer’\n’ko': 'Korean’\n’ku': 'Kurdish (Kurmanji)’\n’ky': 'Kyrgyz’\n’lo': 'Lao’\n’la': 'Latin’\n’lv': 'Latvian’\n’lt': 'Lithuanian’\n’lb': 'Luxembourgish’\n’mk': 'Macedonian’\n’mg': 'Malagasy’\n’ms': 'Malay’\n’ml': 'Malayalam’\n’mt': 'Maltese’\n’mi': 'Maori’\n’mr': 'Marathi’\n’mn': 'Mongolian’\n’my': 'Myanmar (Burmese)’\n’ne': 'Nepali’\n’no': 'Norwegian’\n’ps': 'Pashto’\n’fa': 'Persian’\n’pl': 'Polish’\n’pt': 'Portuguese’\n’ma': 'Punjabi’\n’ro': 'Romanian’\n’ru': 'Russian’\nsm': 'Samoan’\n’gd': 'Scots Gaelic’\n’sr': 'Serbian’\n’st': 'Sesotho’\n’sn': 'Shona’\n’sd': 'Sindhi’\n’si': 'Sinhala’\n’sk': 'Slovak’\n’sl': 'Slovenian’\n’so': 'Somali’\n’es': 'Spanish’\n’su': 'Sudanese’\n’sw': 'Swahili’\n’sv': 'Swedish’\n’tg': 'Tajik’\n’ta': 'Tamil’\n’te': 'Telugu’\n’th': 'Thai’\n’tr': 'Turkish’\n’uk': 'Ukrainian’\n’ur': 'Urdu’\n’uz': 'Uzbek’\n’vi': 'Vietnamese’\n’cy': 'Welsh’\n’xh': 'Xhosa’\n’yi': 'Yiddish’\n’yo': 'Yoruba’\n’zu': 'Zulu'");
-        if (thingToTranslate.length > 200) return message.channel.send(":x: Error! Please keep translations below 200 characters!");
         try {
             let res = await translate(thingToTranslate, {
                 to: languageto