diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js index 76e92b52..99563223 100644 --- a/commands/imageedit/meme.js +++ b/commands/imageedit/meme.js @@ -108,7 +108,8 @@ module.exports = class MemeCommand extends commando.Command { group: 'imageedit', memberName: 'meme', description: "Sends a Meme with text of your choice, and a background of your choice. Split first and second lines with a | (;meme facepalm I can't even | comprehend this)", - examples: [";meme facepalm I can't even | comprehend this", ";meme list"], + details: "**Type Codes:** tenguy, afraid, older, aag, tried, biw, blb, kermit, bd, ch, cbg, wonka, cb, keanu, dsm, live, ants, doge, alwaysonbeat, ermg, facepalm, fwp, fa, fbf, fry, hipster, icanhas, crazypills, mw, noidea, regret, boat, hagrid, sohappy, captain, inigo, iw, ackbar, happening, joker, ive, ll, morpheus, mb, badchoice, mmm, jetpack, red, mordor, oprah, oag, remembers, philosoraptor, jw, patrick, rollsafe, sad-obama, sad-clinton, sadfrog, sad-bush, sad-biden, sad-boehner, saltbae, sarcasticbear, dwight, sb, ss, sf, dodgson, money, sohot, nice, awesome-awkward, awesome, awkward-awesome, awkward, fetch, success, scc, ski, officespace, interesting, toohigh, bs, center, both, winter, xy, buzz, yodawg, uno, yallgot, bad, elf, chosen", + examples: [";meme facepalm I can't even | comprehend this"], args: [{ key: 'type', prompt: 'What meme type do you want to use?', @@ -117,7 +118,7 @@ module.exports = class MemeCommand extends commando.Command { if (memecodes[type.toLowerCase()] || type.toLowerCase() === 'list') { return true; } - return 'Please enter a valid meme type. Enter `list` to view a list of types.'; + return 'Please enter a valid meme type. Use `;help meme` to view a list of types.'; } }, { key: 'content', @@ -140,7 +141,6 @@ module.exports = class MemeCommand extends commando.Command { console.log(`[Command] ${message.content}`); let type = args.type.toLowerCase(); let content = args.content; - if (type === "list") return message.channel.send("**Type Codes:** tenguy, afraid, older, aag, tried, biw, blb, kermit, bd, ch, cbg, wonka, cb, keanu, dsm, live, ants, doge, alwaysonbeat, ermg, facepalm, fwp, fa, fbf, fry, hipster, icanhas, crazypills, mw, noidea, regret, boat, hagrid, sohappy, captain, inigo, iw, ackbar, happening, joker, ive, ll, morpheus, mb, badchoice, mmm, jetpack, red, mordor, oprah, oag, remembers, philosoraptor, jw, patrick, rollsafe, sad-obama, sad-clinton, sadfrog, sad-bush, sad-biden, sad-boehner, saltbae, sarcasticbear, dwight, sb, ss, sf, dodgson, money, sohot, nice, awesome-awkward, awesome, awkward-awesome, awkward, fetch, success, scc, ski, officespace, interesting, toohigh, bs, center, both, winter, xy, buzz, yodawg, uno, yallgot, bad, elf, chosen"); let memeQuery = content.split(" ").join("-").split("-|-"); let toprow = memeQuery[0].split("?").join("~q"); let bottomrow = memeQuery[1].split("?").join("~q"); diff --git a/commands/random/soundboard.js b/commands/random/soundboard.js index ee5ac51a..76010515 100644 --- a/commands/random/soundboard.js +++ b/commands/random/soundboard.js @@ -12,6 +12,7 @@ module.exports = class SoundBoardCommand extends commando.Command { group: 'random', memberName: 'soundboard', description: 'Plays a sound in your voice channel. (;soundboard cat)', + details: "**Available Sounds:** Cat, Pikachu, Vader, Doh, It's a Trap, Mario Death, Pokemon Center, Dun Dun Dun, Spongebob, Ugly Barnacle, Woo Hoo, Space, GLaDOS Bird, Airhorn, Zelda Chest, Eat my Shorts, No This is Patrick, Wumbo", examples: [';soundboard cat'], guildOnly: true, args: [{ @@ -22,7 +23,7 @@ module.exports = class SoundBoardCommand extends commando.Command { if (sounds.avaliable[sound.toLowerCase()] || sound.toLowerCase() === 'list') { return true; } - return 'Sound not found. Enter `list` to view a list of sounds.'; + return 'Sound not found. Use `;help soundboard` to view a list of sounds.'; } }] }); @@ -36,7 +37,6 @@ module.exports = class SoundBoardCommand extends commando.Command { let voiceChannel = message.member.voiceChannel; if (!voiceChannel) return message.channel.send(`:x: Error! Please be in a voice channel first!`); let soundToPlay = args.sound.toLowerCase(); - if (soundToPlay === 'list') return message.channel.send("**Available Sounds:** Cat, Pikachu, Vader, Doh, It's a Trap, Mario Death, Pokemon Center, Dun Dun Dun, Spongebob, Ugly Barnacle, Woo Hoo, Space, GLaDOS Bird, Airhorn, Zelda Chest, Eat my Shorts, No This is Patrick, Wumbo"); let alreadyConnected = await this.client.voiceConnections.get(voiceChannel.guild.id); if (alreadyConnected) { if (alreadyConnected.channel.id === voiceChannel.id) return message.channel.send(':x: Error! I am already playing a sound!'); diff --git a/commands/textedit/translate.js b/commands/textedit/translate.js index fa8efb1b..586426f4 100644 --- a/commands/textedit/translate.js +++ b/commands/textedit/translate.js @@ -116,7 +116,8 @@ module.exports = class TranslateCommand extends commando.Command { group: 'textedit', memberName: 'translate', description: 'Translates text to a given language. (;translate ja Give me the money!)', - examples: [';translate ja Give me the the money!', ';translate list'], + details: "‘af': 'Afrikaans’, ’sq': 'Albanian', 'ar': 'Arabic’, ’hy': 'Armenian’, ’az': 'Azerbaijani’, ’eu': 'Basque’, ’be': 'Belarusian’, ’bn': 'Bengali’, ’bs': 'Bosnian’, ’bg': 'Bulgarian’, ’ca': 'Catalan’, ’ceb': 'Cebuano’, ’ny': 'Chichewa’, ’zh-cn': 'Chinese Simplified’, ’zh-tw': 'Chinese Traditional’, ’co': 'Corsican’, ’hr': 'Croatian’, ’cs': 'Czech’, ’da': 'Danish’, ’nl': 'Dutch’, ’en': 'English’, ’eo': 'Esperanto’, ’et': 'Estonian’, ’tl': 'Filipino’, ’fi': 'Finnish’, ’fr': 'French’, ’fy': 'Frisian’, ’gl': 'Galician’, ’ka': 'Georgian’, ’de': 'German’, ’el': 'Greek’, ’gu': 'Gujarati’, ’ht': 'Haitian Creole’, ’ha': 'Hausa’, ’haw': 'Hawaiian’, ’iw': 'Hebrew’, ’hi': 'Hindi’, ’hmn': 'Hmong’, ’hu': 'Hungarian’, ’is': 'Icelandic’, ’ig': 'Igbo’, ’id': 'Indonesian’, ’ga': 'Irish’, ’it': 'Italian’, ’ja': 'Japanese’, ’jw': 'Javanese’, ’kn': 'Kannada’, ’kk': 'Kazakh’, ’km': 'Khmer’, ’ko': 'Korean’, ’ku': 'Kurdish (Kurmanji)’, ’ky': 'Kyrgyz’, ’lo': 'Lao’, ’la': 'Latin’, ’lv': 'Latvian’, ’lt': 'Lithuanian’, ’lb': 'Luxembourgish’, ’mk': 'Macedonian’, ’mg': 'Malagasy’, ’ms': 'Malay’, ’ml': 'Malayalam’, ’mt': 'Maltese’, ’mi': 'Maori’, ’mr': 'Marathi’, ’mn': 'Mongolian’, ’my': 'Myanmar (Burmese)’, ’ne': 'Nepali’, ’no': 'Norwegian’, ’ps': 'Pashto’, ’fa': 'Persian’, ’pl': 'Polish’, ’pt': 'Portuguese’, ’ma': 'Punjabi’, ’ro': 'Romanian’, ’ru': 'Russian’, sm': 'Samoan’, ’gd': 'Scots Gaelic’, ’sr': 'Serbian’, ’st': 'Sesotho’, ’sn': 'Shona’, ’sd': 'Sindhi’, ’si': 'Sinhala’, ’sk': 'Slovak’, ’sl': 'Slovenian’, ’so': 'Somali’, ’es': 'Spanish’, ’su': 'Sudanese’, ’sw': 'Swahili’, ’sv': 'Swedish’, ’tg': 'Tajik’, ’ta': 'Tamil’, ’te': 'Telugu’, ’th': 'Thai’, ’tr': 'Turkish’, ’uk': 'Ukrainian’, ’ur': 'Urdu’, ’uz': 'Uzbek’, ’vi': 'Vietnamese’, ’cy': 'Welsh’, ’xh': 'Xhosa’, ’yi': 'Yiddish’, ’yo': 'Yoruba’, ’zu': 'Zulu'", + examples: [';translate ja Give me the the money!'], args: [{ key: 'to', prompt: 'What language would you like to translate to?', @@ -125,7 +126,7 @@ module.exports = class TranslateCommand extends commando.Command { if (languages[to.toLowerCase()] || to.toLowerCase() === 'list') { return true; } - return 'Please enter a valid language code. Enter `list` for a list of codes.'; + return 'Please enter a valid language code. Use `;help translate` for a list of codes.'; } }, { key: 'text', @@ -148,7 +149,6 @@ module.exports = class TranslateCommand extends commando.Command { console.log(`[Command] ${message.content}`); 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'"); try { let res = await translate(thingToTranslate, { to: languageto diff --git a/index.js b/index.js index 867f74c4..8ca02da8 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,3 @@ -const Discord = require('discord.js'); const commando = require('discord.js-commando'); const request = require('superagent'); const config = require('./config.json'); diff --git a/package.json b/package.json index 17475c6f..bb63960c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cleverbot-node": "^0.3.5", "cowsay": "^1.1.9", "discord.js": "github:hydrabolt/discord.js", - "discord.js-commando": "^0.9.0", + "discord.js-commando": "github:gawdl3y/discord.js-commando", "google-translate-api": "^2.2.2", "hepburn": "^1.0.0", "imdb-api": "^2.2.1",