diff --git a/assets/images/this-is-beautiful.png b/assets/images/beautiful.png similarity index 100% rename from assets/images/this-is-beautiful.png rename to assets/images/beautiful.png diff --git a/assets/images/dark-theme-light-theme/default.png b/assets/images/dark-light/default.png similarity index 100% rename from assets/images/dark-theme-light-theme/default.png rename to assets/images/dark-light/default.png diff --git a/assets/images/dark-theme-light-theme/moth.png b/assets/images/dark-light/moth.png similarity index 100% rename from assets/images/dark-theme-light-theme/moth.png rename to assets/images/dark-light/moth.png diff --git a/assets/images/nom.gif b/assets/images/nom.gif deleted file mode 100644 index ef290315..00000000 Binary files a/assets/images/nom.gif and /dev/null differ diff --git a/assets/images/source.png b/assets/images/source.png deleted file mode 100644 index ed8a8a69..00000000 Binary files a/assets/images/source.png and /dev/null differ diff --git a/assets/images/the-ultimate-tattoo.png b/assets/images/ultimate-tattoo.png similarity index 100% rename from assets/images/the-ultimate-tattoo.png rename to assets/images/ultimate-tattoo.png diff --git a/assets/images/this-is-worthless.png b/assets/images/worthless.png similarity index 100% rename from assets/images/this-is-worthless.png rename to assets/images/worthless.png diff --git a/assets/json/discord-email-fun-fact.json b/assets/json/discord-email-fun-fact.json deleted file mode 100644 index 0f005471..00000000 --- a/assets/json/discord-email-fun-fact.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - "In New Zealand, it is a criminal offense to carry a copy of the game Manhunt.", - "The bushes and clouds in the original Super Mario Bros are the same sprite recolored.", - "When space invaders launched in Japan, its popularity caused a temporary shortage of 100 Yen coins.", - "The Discord logo is named Clyde.", - "In Overwatch, the tiny yellow bird that hangs out with Bastion is named Ganymede - a beautiful young boy from Greek mythology.", - "When revealed in 2014, Overwatch was Blizzard's first new IP in 17 years.", - "There is a scene in the original Metal Gear Solid where Campbell will poke fun at the player if they're using a TV with Mono audio.", - "Prior to adding Blood Elves, Alliance outnumbered Horde on most World of Warcraft servers.", - "The successful release of the SNES gained the attention of the infamous Japanese crime organization the Yakuza. Nintendo then began to ship the devices at night to avoid robbery.", - "The cover art for Neil Young's album \"Silver and Gold\" is a photo taken with a Game Boy Camera.", - "To choose your Eevee's evolution in Pokemon Go, rename it to Sparky (Jolteon), Rainer (Vaporeon), or Pyro (Flareon).", - "In the original Fallout, a player character with less than 4 Intelligence can only communicate with grunts and other noises.", - "In League of Legends, if you play Jax with the Jaximus skin, he'll occasionally say \"Here's to you, kid.\" This honors a Make-A-Wish patient whose favorite character was Jax.", - "There are four skins in League of Legends named after internet browsers: Foxfire Ahri, Safari Caitlyn, Explorer Ezreal and Chrome Rammus.", - "You can't see your own shadow in CS:GO.", - "In Hearthstone, using the Hunter card Animal Companion against Kel'Thuzad will summon his cat Mr. Bigglesworth rather than the usual beasts.", - "Starting with version 6.29 of the original Dota, each update ending in a \"9\" contained a secret quest, usually showing off an upcoming hero such as Invoker.", - "Rocket League is a sequel to the 2009 physics based vehicle soccer game Supersonic Acrobatic Rocket-Powered Battle-Cars.", - "Discord was almost named Wyvern. Dodged a bullet there, whew.", - "The creator of the Kirby and Super Smash Bros. Series, Masahiro Sakurai, voiced King DeDeDe in all Smash games the character appears in.", - "HAL Laboratory, the developer responsible for Kirby, Mother, and Super Smash Bros. series, was named HAL because each letter put them ahead of IBM.", - "While trying to create a pig in Minecraft, Markus Persson accidentally switched the length and height in code and ended up with the monstrosity now known as a creeper.", - "The avatar of Minecraft creator Markus Persson is the only character that drops an apple when it dies.", - "Team Fortress, Day of Defeat, Counter-Strike, Ricochet, and Dota were all originally fan-made mods.", - "Pachinko Machines (mechanical games used for gambling) make Sega more money in Japan than game sales worldwide." -] diff --git a/assets/json/final-grade-calculator.json b/assets/json/final-grade.json similarity index 100% rename from assets/json/final-grade-calculator.json rename to assets/json/final-grade.json diff --git a/assets/json/roman-numeral.json b/assets/json/roman.json similarity index 100% rename from assets/json/roman-numeral.json rename to assets/json/roman.json diff --git a/assets/json/rule-of-the-internet.json b/assets/json/rule.json similarity index 100% rename from assets/json/rule-of-the-internet.json rename to assets/json/rule.json diff --git a/assets/json/sorting-hat-quiz.json b/assets/json/sorting-hat.json similarity index 100% rename from assets/json/sorting-hat-quiz.json rename to assets/json/sorting-hat.json diff --git a/assets/json/alphabet-reverse.json b/assets/json/tebahpla.json similarity index 100% rename from assets/json/alphabet-reverse.json rename to assets/json/tebahpla.json diff --git a/assets/json/typing-game.json b/assets/json/typing-test.json similarity index 100% rename from assets/json/typing-game.json rename to assets/json/typing-test.json diff --git a/commands/analyze/butt.js b/commands/analyze/butt.js index 99219872..ee87abf6 100644 --- a/commands/analyze/butt.js +++ b/commands/analyze/butt.js @@ -22,6 +22,7 @@ module.exports = class ButtCommand extends Command { } run(msg, { user }) { + if (user.id === this.client.user.id) return msg.reply('Me? I think I have the best butt around!'); const random = new Random(Random.engines.mt19937().seed(user.id)); const quality = random.integer(0, texts.length - 1); return msg.reply(`${user.id === msg.author.id ? 'ur' : `${user.username}'s`} butt is ${texts[quality]}`); diff --git a/commands/analyze/dick.js b/commands/analyze/dick.js index 806a2107..b6a67de2 100644 --- a/commands/analyze/dick.js +++ b/commands/analyze/dick.js @@ -5,7 +5,7 @@ module.exports = class DickCommand extends Command { constructor(client) { super(client, { name: 'dick', - aliases: ['dick-size'], + aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size'], group: 'analyze', memberName: 'dick', description: 'Determines your dick size.', @@ -23,6 +23,7 @@ module.exports = class DickCommand extends Command { run(msg, { user }) { const random = new Random(Random.engines.mt19937().seed(user.id)); - return msg.reply(`8${'='.repeat(random.integer(0, 200))}D`); + const length = random.integer(0, 200); + return msg.reply(`8${'='.repeat(user.id === this.client.user.id ? length + 1 : length)}D`); } }; diff --git a/commands/analyze/gender.js b/commands/analyze/gender.js index 1c6d5768..8570997d 100644 --- a/commands/analyze/gender.js +++ b/commands/analyze/gender.js @@ -1,11 +1,11 @@ const Command = require('../../structures/Command'); const request = require('node-superfetch'); -module.exports = class GenderAnalyzeCommand extends Command { +module.exports = class GenderCommand extends Command { constructor(client) { super(client, { - name: 'gender-analyze', - aliases: ['gender', 'guess-gender', 'analyze-gender', 'gender-guess'], + name: 'gender', + aliases: ['guess-gender', 'gender-guess'], group: 'analyze', memberName: 'gender', description: 'Determines the gender of a name.', diff --git a/commands/analyze/guess-looks.js b/commands/analyze/guess-looks.js index 9934e508..7643f33e 100644 --- a/commands/analyze/guess-looks.js +++ b/commands/analyze/guess-looks.js @@ -24,6 +24,7 @@ module.exports = class GuessLooksCommand extends Command { } run(msg, { user }) { + if (user.id === this.client.user.id) return msg.reply('Me? Just look at my avatar, dummy.'); const authorUser = user.id === msg.author.id; const random = new Random(Random.engines.mt19937().seed(user.id)); const gender = genders[random.integer(0, genders.length - 1)]; diff --git a/commands/analyze/iq.js b/commands/analyze/iq.js index 12491cde..fc62ee0f 100644 --- a/commands/analyze/iq.js +++ b/commands/analyze/iq.js @@ -21,6 +21,7 @@ module.exports = class IQCommand extends Command { } run(msg, { user }) { + if (user.id === this.client.user.id) return msg.reply('Me? My IQ score is off the charts!'); const random = new Random(Random.engines.mt19937().seed(user.id)); const score = random.integer(20, 170); return msg.reply(`${user.id === msg.author.id ? 'Your' : `${user.username}'s`} IQ score is ${score}.`); diff --git a/commands/analyze/psycho-pass.js b/commands/analyze/psycho-pass.js index fdfc48ee..04acb15f 100644 --- a/commands/analyze/psycho-pass.js +++ b/commands/analyze/psycho-pass.js @@ -22,6 +22,7 @@ module.exports = class PsychoPassCommand extends Command { } run(msg, { user }) { + if (user.id === this.client.user.id) return msg.reply('Me? I-I\'m not dangerous, I promise!'); const random = new Random(Random.engines.mt19937().seed(user.id)); const coefficient = random.integer(0, 500); let res; diff --git a/commands/analyze/ship.js b/commands/analyze/ship.js index 56d3dd4f..3961e6c0 100644 --- a/commands/analyze/ship.js +++ b/commands/analyze/ship.js @@ -28,8 +28,11 @@ module.exports = class ShipCommand extends Command { run(msg, { first, second }) { if (first.id === second.id) return msg.reply('Shipping someone with themselves would be pretty weird.'); + const botText = first.id === this.client.user.id || second.id === this.client.user.id + ? '\nBut you\'re still rejected. Sorry.' + : ''; const random = new Random(Random.engines.mt19937().seed(Math.abs(first.id - second.id))); const level = random.integer(0, 100); - return msg.say(`${first.username} and ${second.username} have a compatability of... **${level}%**!`); + return msg.say(`${first.username} and ${second.username} have a compatability of... **${level}%**!${botText}`); } }; diff --git a/commands/analyze/what-anime.js b/commands/analyze/what-anime.js index 52fa0bb1..90d60c3e 100644 --- a/commands/analyze/what-anime.js +++ b/commands/analyze/what-anime.js @@ -7,7 +7,7 @@ module.exports = class WhatAnimeCommand extends Command { constructor(client) { super(client, { name: 'what-anime', - aliases: ['whatanime-ga', 'anime-source', 'anime-sauce', 'weeb-sauce', 'trace-moe'], + aliases: ['anime-source', 'anime-src', 'trace-moe', 'source', 'src'], group: 'analyze', memberName: 'what-anime', description: 'Determines what anime a screenshot is from.', diff --git a/commands/avatar-edit/3000-years.js b/commands/avatar-edit/3000-years.js index 0fc7cf8e..6cb21678 100644 --- a/commands/avatar-edit/3000-years.js +++ b/commands/avatar-edit/3000-years.js @@ -7,7 +7,7 @@ module.exports = class ThreeThousandYearsCommand extends Command { constructor(client) { super(client, { name: '3000-years', - aliases: ['az', '3ky', '3k-years'], + aliases: ['3ky', '3k-years'], group: 'avatar-edit', memberName: '3000-years', description: 'Draws a user\'s avatar over Pokémon\'s "It\'s been 3000 years" meme.', diff --git a/commands/avatar-edit/this-is-beautiful.js b/commands/avatar-edit/beautiful.js similarity index 84% rename from commands/avatar-edit/this-is-beautiful.js rename to commands/avatar-edit/beautiful.js index df7932a5..bbe64f1e 100644 --- a/commands/avatar-edit/this-is-beautiful.js +++ b/commands/avatar-edit/beautiful.js @@ -3,13 +3,13 @@ const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); const path = require('path'); -module.exports = class ThisIsBeautifulCommand extends Command { +module.exports = class BeautifulCommand extends Command { constructor(client) { super(client, { - name: 'this-is-beautiful', - aliases: ['beautiful', 'grunkle-stan'], + name: 'beautiful', + aliases: ['this-is-beautiful', 'grunkle-stan'], group: 'avatar-edit', - memberName: 'this-is-beautiful', + memberName: 'beautiful', description: 'Draws a user\'s avatar over Gravity Falls\' "Oh, this? This is beautiful." meme.', throttling: { usages: 1, @@ -30,7 +30,7 @@ module.exports = class ThisIsBeautifulCommand extends Command { async run(msg, { user }) { const avatarURL = user.displayAvatarURL({ format: 'png', size: 128 }); try { - const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'this-is-beautiful.png')); + const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'beautiful.png')); const { body } = await request.get(avatarURL); const avatar = await loadImage(body); const canvas = createCanvas(base.width, base.height); @@ -40,7 +40,7 @@ module.exports = class ThisIsBeautifulCommand extends Command { ctx.drawImage(avatar, 249, 24, 105, 105); ctx.drawImage(avatar, 249, 223, 105, 105); ctx.drawImage(base, 0, 0); - return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'this-is-beautiful.png' }] }); + return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'beautiful.png' }] }); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); } diff --git a/commands/avatar-edit/drakeposting.js b/commands/avatar-edit/drakeposting.js index 3a64a9fd..54a811e1 100644 --- a/commands/avatar-edit/drakeposting.js +++ b/commands/avatar-edit/drakeposting.js @@ -7,7 +7,7 @@ module.exports = class DrakepostingCommand extends Command { constructor(client) { super(client, { name: 'drakeposting', - aliases: ['drake', 'nah-yeah', 'naw-yeah'], + aliases: ['drake'], group: 'avatar-edit', memberName: 'drakeposting', description: 'Draws two user\'s avatars over the "Drakeposting" meme.', diff --git a/commands/avatar-edit/look-at-this-photograph.js b/commands/avatar-edit/look-at-this-photograph.js index 6e6c5445..cf88d5d7 100644 --- a/commands/avatar-edit/look-at-this-photograph.js +++ b/commands/avatar-edit/look-at-this-photograph.js @@ -7,7 +7,7 @@ module.exports = class LookAtThisPhotographCommand extends Command { constructor(client) { super(client, { name: 'look-at-this-photograph', - aliases: ['photo', 'nickelback', 'look-at-this-photo', 'photograph'], + aliases: ['nickelback', 'look-at-this-photo', 'photograph'], group: 'avatar-edit', memberName: 'look-at-this-photograph', description: 'Draws a user\'s avatar over Nickelback\'s photograph.', diff --git a/commands/avatar-edit/steam-card.js b/commands/avatar-edit/steam-card.js index d4fb2c09..d555ac02 100644 --- a/commands/avatar-edit/steam-card.js +++ b/commands/avatar-edit/steam-card.js @@ -10,7 +10,7 @@ module.exports = class SteamCardCommand extends Command { constructor(client) { super(client, { name: 'steam-card', - aliases: ['valve-card', 'card', 'discord-card'], + aliases: ['valve-card'], group: 'avatar-edit', memberName: 'steam-card', description: 'Draws a user\'s avatar on a Steam Trading Card.', diff --git a/commands/avatar-edit/triggered.js b/commands/avatar-edit/triggered.js index 38f28e17..9859cbe9 100644 --- a/commands/avatar-edit/triggered.js +++ b/commands/avatar-edit/triggered.js @@ -8,6 +8,7 @@ module.exports = class TriggeredCommand extends Command { constructor(client) { super(client, { name: 'triggered', + aliases: ['trigger'], group: 'avatar-edit', memberName: 'triggered', description: 'Draws a user\'s avatar over the "Triggered" meme.', diff --git a/commands/avatar-edit/the-ultimate-tattoo.js b/commands/avatar-edit/ultimate-tattoo.js similarity index 82% rename from commands/avatar-edit/the-ultimate-tattoo.js rename to commands/avatar-edit/ultimate-tattoo.js index a2be4cca..8890eaa8 100644 --- a/commands/avatar-edit/the-ultimate-tattoo.js +++ b/commands/avatar-edit/ultimate-tattoo.js @@ -3,13 +3,13 @@ const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); const path = require('path'); -module.exports = class TheUltimateTattooCommand extends Command { +module.exports = class UltimateTattooCommand extends Command { constructor(client) { super(client, { - name: 'the-ultimate-tattoo', - aliases: ['ultimate-tattoo', 'tattoo'], + name: 'ultimate-tattoo', + aliases: ['the-ultimate-tattoo', 'tattoo'], group: 'avatar-edit', - memberName: 'the-ultimate-tattoo', + memberName: 'ultimate-tattoo', description: 'Draws a user\'s avatar as "The Ultimate Tattoo".', throttling: { usages: 1, @@ -30,7 +30,7 @@ module.exports = class TheUltimateTattooCommand extends Command { async run(msg, { user }) { const avatarURL = user.displayAvatarURL({ format: 'png', size: 256 }); try { - const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'the-ultimate-tattoo.png')); + const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'ultimate-tattoo.png')); const { body } = await request.get(avatarURL); const avatar = await loadImage(body); const canvas = createCanvas(base.width, base.height); @@ -39,7 +39,7 @@ module.exports = class TheUltimateTattooCommand extends Command { ctx.rotate(-10 * (Math.PI / 180)); ctx.drawImage(avatar, 84, 690, 300, 300); ctx.rotate(10 * (Math.PI / 180)); - return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'the-ultimate-tattoo.png' }] }); + return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'ultimate-tattoo.png' }] }); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); } diff --git a/commands/avatar-edit/this-is-worthless.js b/commands/avatar-edit/worthless.js similarity index 84% rename from commands/avatar-edit/this-is-worthless.js rename to commands/avatar-edit/worthless.js index 856615ab..2674daff 100644 --- a/commands/avatar-edit/this-is-worthless.js +++ b/commands/avatar-edit/worthless.js @@ -3,13 +3,13 @@ const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); const path = require('path'); -module.exports = class ThisIsWorthlessCommand extends Command { +module.exports = class WorthlessCommand extends Command { constructor(client) { super(client, { - name: 'this-is-worthless', - aliases: ['worthless'], + name: 'worthless', + aliases: ['this-is-worthless'], group: 'avatar-edit', - memberName: 'this-is-worthless', + memberName: 'worthless', description: 'Draws a user\'s avatar over Gravity Falls\' "Oh, this? This is worthless." meme.', throttling: { usages: 1, @@ -30,7 +30,7 @@ module.exports = class ThisIsWorthlessCommand extends Command { async run(msg, { user }) { const avatarURL = user.displayAvatarURL({ format: 'png', size: 512 }); try { - const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'this-is-worthless.png')); + const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'worthless.png')); const { body } = await request.get(avatarURL); const avatar = await loadImage(body); const canvas = createCanvas(base.width, base.height); @@ -39,7 +39,7 @@ module.exports = class ThisIsWorthlessCommand extends Command { ctx.rotate(6 * (Math.PI / 180)); ctx.drawImage(avatar, 496, 183, 400, 400); ctx.rotate(-6 * (Math.PI / 180)); - return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'this-is-worthless.png' }] }); + return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'worthless.png' }] }); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); } diff --git a/commands/events/astronomy-picture-of-the-day.js b/commands/events/apod.js similarity index 74% rename from commands/events/astronomy-picture-of-the-day.js rename to commands/events/apod.js index 02068ea9..617cb0f4 100644 --- a/commands/events/astronomy-picture-of-the-day.js +++ b/commands/events/apod.js @@ -3,13 +3,13 @@ const request = require('node-superfetch'); const { shorten } = require('../../util/Util'); const { GOV_KEY } = process.env; -module.exports = class AstronomyPictureOfTheDayCommand extends Command { +module.exports = class ApodCommand extends Command { constructor(client) { super(client, { - name: 'astronomy-picture-of-the-day', - aliases: ['nasa-apod', 'apod', 'nasa-astronomy-picture-of-the-day'], + name: 'apod', + aliases: ['astronomy-picture-of-the-day'], group: 'events', - memberName: 'astronomy-picture-of-the-day', + memberName: 'apod', description: 'Responds with today\'s Astronomy Picture of the Day.', clientPermissions: ['ATTACH_FILES'] }); diff --git a/commands/events/calendar.js b/commands/events/calendar.js index b289c9e0..abdc6c4f 100644 --- a/commands/events/calendar.js +++ b/commands/events/calendar.js @@ -7,7 +7,7 @@ module.exports = class CalendarCommand extends Command { constructor(client) { super(client, { name: 'calendar', - aliases: ['google-calendar', 'holiday', 'holidays', 'events'], + aliases: ['holidays', 'events'], group: 'events', memberName: 'calendar', description: 'Responds with today\'s holidays.' diff --git a/commands/events/days-until.js b/commands/events/days-until.js index 943a3f38..63216fc3 100644 --- a/commands/events/days-until.js +++ b/commands/events/days-until.js @@ -6,6 +6,7 @@ module.exports = class DaysUntilCommand extends Command { constructor(client) { super(client, { name: 'days-until', + aliases: ['countdown'], group: 'events', memberName: 'days-until', description: 'Responds with how many days there are until a certain date.', diff --git a/commands/events/is-tuesday.js b/commands/events/is-tuesday.js index 8acd3588..3805cfa6 100644 --- a/commands/events/is-tuesday.js +++ b/commands/events/is-tuesday.js @@ -1,5 +1,4 @@ const Command = require('../../structures/Command'); -const isTuesday = require('is-tuesday'); module.exports = class IsTuesdayCommand extends Command { constructor(client) { @@ -13,6 +12,6 @@ module.exports = class IsTuesdayCommand extends Command { } run(msg) { - return msg.say(`Today **is${isTuesday() ? '' : ' not'}** Tuesday.`); + return msg.say(`Today **is${new Date().getDay() === 2 ? '' : ' not'}** Tuesday.`); } }; diff --git a/commands/events/today-in-history.js b/commands/events/today-in-history.js index 4c5dc43c..7fb9b176 100644 --- a/commands/events/today-in-history.js +++ b/commands/events/today-in-history.js @@ -6,7 +6,7 @@ module.exports = class TodayInHistoryCommand extends Command { constructor(client) { super(client, { name: 'today-in-history', - aliases: ['event', 'today', 'history'], + aliases: ['today', 'history'], group: 'events', memberName: 'today-in-history', description: 'Responds with an event that occurred today in history.', diff --git a/commands/games/akinator.js b/commands/games/akinator.js index edf8157a..bb24ad19 100644 --- a/commands/games/akinator.js +++ b/commands/games/akinator.js @@ -8,7 +8,7 @@ module.exports = class AkinatorCommand extends Command { constructor(client) { super(client, { name: 'akinator', - aliases: ['the-web-genie', 'web-genie', 'aki'], + aliases: ['aki'], group: 'games', memberName: 'akinator', description: 'Think about a real or fictional character, I will try to guess who it is.', diff --git a/commands/games/blackjack.js b/commands/games/blackjack.js index 04cee15a..91f17167 100644 --- a/commands/games/blackjack.js +++ b/commands/games/blackjack.js @@ -8,7 +8,7 @@ module.exports = class BlackjackCommand extends Command { constructor(client) { super(client, { name: 'blackjack', - aliases: ['twenty-one', '21'], + aliases: ['twenty-one', '21', 'bj'], group: 'games', memberName: 'blackjack', description: 'Play a game of blackjack.', diff --git a/commands/games/box-choosing.js b/commands/games/box-choosing.js index 190507d7..66847c16 100644 --- a/commands/games/box-choosing.js +++ b/commands/games/box-choosing.js @@ -7,7 +7,7 @@ module.exports = class BoxChoosingCommand extends Command { constructor(client) { super(client, { name: 'box-choosing', - aliases: ['box-choose', 'boxes'], + aliases: ['box-choose'], group: 'games', memberName: 'box-choosing', description: 'Do you believe that there are choices in life? Taken from Higurashi Chapter 4.' diff --git a/commands/games/captcha-quiz.js b/commands/games/captcha.js similarity index 91% rename from commands/games/captcha-quiz.js rename to commands/games/captcha.js index be9f7096..52090edb 100644 --- a/commands/games/captcha-quiz.js +++ b/commands/games/captcha.js @@ -4,13 +4,13 @@ const path = require('path'); const pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ23456789'.split(''); registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Captcha.ttf'), { family: 'Captcha' }); -module.exports = class CaptchaQuizCommand extends Command { +module.exports = class CaptchaCommand extends Command { constructor(client) { super(client, { - name: 'captcha-quiz', - aliases: ['captcha'], + name: 'captcha', + aliases: ['captcha-quiz'], group: 'games', - memberName: 'captcha-quiz', + memberName: 'captcha', description: 'Try to guess what the captcha says.', throttling: { usages: 1, diff --git a/commands/games/chance.js b/commands/games/chance.js index 97b9a65d..bac5fb46 100644 --- a/commands/games/chance.js +++ b/commands/games/chance.js @@ -4,7 +4,7 @@ module.exports = class ChanceCommand extends Command { constructor(client) { super(client, { name: 'chance', - aliases: ['1-in', 'one-in', 'lottery-classic'], + aliases: ['1-in', 'one-in'], group: 'games', memberName: 'chance', description: 'Attempt to win with a 1 in 1000 (or your choice) chance of winning.', diff --git a/commands/games/fishy.js b/commands/games/fishy.js index 89d1ca4f..7e0c4d58 100644 --- a/commands/games/fishy.js +++ b/commands/games/fishy.js @@ -6,7 +6,7 @@ module.exports = class FishyCommand extends Command { constructor(client) { super(client, { name: 'fishy', - aliases: ['fish', 'fishing'], + aliases: ['fishing'], group: 'games', memberName: 'fishy', description: 'Go fishing.' diff --git a/commands/games/hunger-games.js b/commands/games/hunger-games.js index da2f762b..7db4a013 100644 --- a/commands/games/hunger-games.js +++ b/commands/games/hunger-games.js @@ -7,7 +7,7 @@ module.exports = class HungerGamesCommand extends Command { constructor(client) { super(client, { name: 'hunger-games', - aliases: ['hunger-games-simulator', 'brant-steele'], + aliases: ['hunger-games-simulator', 'hunger-games-sim'], group: 'games', memberName: 'hunger-games', description: 'Simulate a Hunger Games match with up to 24 tributes.', diff --git a/commands/games/mafia.js b/commands/games/mafia.js index d1554122..eaee9235 100644 --- a/commands/games/mafia.js +++ b/commands/games/mafia.js @@ -142,6 +142,7 @@ module.exports = class MafiaCommand extends Command { await user.send(`Your role will be: ${roles[i]}!`); i++; } + return players; } getHanged(votes, players, playersArr) { diff --git a/commands/games/math-quiz.js b/commands/games/math-quiz.js index 2bbda06d..5bfee81e 100644 --- a/commands/games/math-quiz.js +++ b/commands/games/math-quiz.js @@ -15,7 +15,6 @@ module.exports = class MathQuizCommand extends Command { constructor(client) { super(client, { name: 'math-quiz', - aliases: ['math-game'], group: 'games', memberName: 'math-quiz', description: 'See how fast you can answer a math problem in a given time limit.', diff --git a/commands/games/quiz-duel.js b/commands/games/quiz-duel.js index 69c5efcd..de8d63ea 100644 --- a/commands/games/quiz-duel.js +++ b/commands/games/quiz-duel.js @@ -8,7 +8,7 @@ module.exports = class QuizDuelCommand extends Command { constructor(client) { super(client, { name: 'quiz-duel', - aliases: ['jeopardy-duel', 'trivia-duel'], + aliases: ['trivia-duel'], group: 'games', memberName: 'quiz-duel', description: 'Answer a series of quiz questions against an opponent.', diff --git a/commands/games/quiz.js b/commands/games/quiz.js index aa2e7070..0288834b 100644 --- a/commands/games/quiz.js +++ b/commands/games/quiz.js @@ -10,7 +10,7 @@ module.exports = class QuizCommand extends Command { constructor(client) { super(client, { name: 'quiz', - aliases: ['jeopardy', 'trivia'], + aliases: ['trivia'], group: 'games', memberName: 'quiz', description: 'Answer a quiz question.', diff --git a/commands/games/sorting-hat-quiz.js b/commands/games/sorting-hat.js similarity index 91% rename from commands/games/sorting-hat-quiz.js rename to commands/games/sorting-hat.js index b95e7993..a895013e 100644 --- a/commands/games/sorting-hat-quiz.js +++ b/commands/games/sorting-hat.js @@ -1,16 +1,16 @@ const Command = require('../../structures/Command'); const { stripIndents } = require('common-tags'); const { shuffle } = require('../../util/Util'); -const { questions, houses, descriptions } = require('../../assets/json/sorting-hat-quiz'); +const { questions, houses, descriptions } = require('../../assets/json/sorting-hat'); const choices = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P']; -module.exports = class SortingHatQuizCommand extends Command { +module.exports = class SortingHatCommand extends Command { constructor(client) { super(client, { - name: 'sorting-hat-quiz', - aliases: ['sorting-hat', 'pottermore', 'hogwarts'], + name: 'sorting-hat', + aliases: ['sorting-hat-quiz', 'hogwarts', 'hogwarts-house'], group: 'games', - memberName: 'sorting-hat-quiz', + memberName: 'sorting-hat', description: 'Take a quiz to determine your Hogwarts house.' }); diff --git a/commands/games/typing-test.js b/commands/games/typing-test.js index 7b6bfd9e..a3598b8c 100644 --- a/commands/games/typing-test.js +++ b/commands/games/typing-test.js @@ -1,7 +1,7 @@ const Command = require('../../structures/Command'); const { stripIndents } = require('common-tags'); const { list } = require('../../util/Util'); -const sentences = require('../../assets/json/typing-game'); +const sentences = require('../../assets/json/typing-test'); const difficulties = ['easy', 'medium', 'hard', 'extreme', 'impossible']; const times = { easy: 25000, @@ -15,7 +15,6 @@ module.exports = class TypingTestCommand extends Command { constructor(client) { super(client, { name: 'typing-test', - aliases: ['typing-game'], group: 'games', memberName: 'typing-test', description: 'See how fast you can type a sentence in a given time limit.', diff --git a/commands/games/wizard-convention.js b/commands/games/wizard-convention.js index 380657de..e34dff1d 100644 --- a/commands/games/wizard-convention.js +++ b/commands/games/wizard-convention.js @@ -142,6 +142,7 @@ module.exports = class WizardConventionCommand extends Command { await user.send(`Your role will be: ${roles[i]}!`); i++; } + return players; } getExpelled(votes, players, playersArr) { diff --git a/commands/image-edit/circle.js b/commands/image-edit/circle.js index fae062ab..8e163ba3 100644 --- a/commands/image-edit/circle.js +++ b/commands/image-edit/circle.js @@ -6,7 +6,7 @@ module.exports = class CircleCommand extends Command { constructor(client) { super(client, { name: 'circle', - aliases: ['circle-avatar', 'circle-ava', 'circle-image', 'circle-img', 'preview-avatar', 'preview-ava'], + aliases: ['preview-avatar', 'preview-ava'], group: 'image-edit', memberName: 'circle', description: 'Draws an image or a user\'s avatar as a circle.', diff --git a/commands/image-edit/demotivational-poster.js b/commands/image-edit/demotivational.js similarity index 94% rename from commands/image-edit/demotivational-poster.js rename to commands/image-edit/demotivational.js index 64a8b966..d96dc6d2 100644 --- a/commands/image-edit/demotivational-poster.js +++ b/commands/image-edit/demotivational.js @@ -7,13 +7,13 @@ registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Noto-Regular.t registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Noto-CJK.otf'), { family: 'Noto' }); registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Noto-Emoji.ttf'), { family: 'Noto' }); -module.exports = class DemotivationalPosterCommand extends Command { +module.exports = class DemotivationalCommand extends Command { constructor(client) { super(client, { - name: 'demotivational-poster', - aliases: ['demotivational'], + name: 'demotivational', + aliases: ['demotivational-poster'], group: 'image-edit', - memberName: 'demotivational-poster', + memberName: 'demotivational', description: 'Draws an image or a user\'s avatar and the text you specify as a demotivational poster.', throttling: { usages: 1, diff --git a/commands/image-edit/distort.js b/commands/image-edit/distort.js index c2866e8e..8739b1bd 100644 --- a/commands/image-edit/distort.js +++ b/commands/image-edit/distort.js @@ -7,7 +7,6 @@ module.exports = class DistortCommand extends Command { constructor(client) { super(client, { name: 'distort', - aliases: ['under-water'], group: 'image-edit', memberName: 'distort', description: 'Draws an image or a user\'s avatar but distorted.', diff --git a/commands/image-edit/fire.js b/commands/image-edit/fire.js index 9300c2f7..f3b48e0c 100644 --- a/commands/image-edit/fire.js +++ b/commands/image-edit/fire.js @@ -8,7 +8,7 @@ module.exports = class FireCommand extends Command { constructor(client) { super(client, { name: 'fire', - aliases: ['flame', 'hell'], + aliases: ['hell'], group: 'image-edit', memberName: 'fire', description: 'Draws a fiery border over an image or a user\'s avatar.', diff --git a/commands/image-edit/gru-plan.js b/commands/image-edit/gru-plan.js index 48cbcbdc..dd7f9d79 100644 --- a/commands/image-edit/gru-plan.js +++ b/commands/image-edit/gru-plan.js @@ -11,7 +11,7 @@ module.exports = class GruPlanCommand extends Command { constructor(client) { super(client, { name: 'gru-plan', - aliases: ['grus-plan', 'gru', 'plan'], + aliases: ['grus-plan', 'gru'], group: 'image-edit', memberName: 'gru-plan', description: 'Sends a Gru\'s Plan meme with steps of your choice.', diff --git a/commands/image-edit/illegal.js b/commands/image-edit/illegal.js index dd877ba7..7295f7db 100644 --- a/commands/image-edit/illegal.js +++ b/commands/image-edit/illegal.js @@ -10,7 +10,7 @@ module.exports = class IllegalCommand extends Command { constructor(client) { super(client, { name: 'illegal', - aliases: ['is-now-illegal', 'trump', 'first-order-of-business'], + aliases: ['is-now-illegal', 'trump'], group: 'image-edit', memberName: 'illegal', description: 'Makes President Trump make your text illegal.', diff --git a/commands/image-edit/shields-io-badge.js b/commands/image-edit/shields-io-badge.js index b78486a3..fee6f171 100644 --- a/commands/image-edit/shields-io-badge.js +++ b/commands/image-edit/shields-io-badge.js @@ -5,7 +5,7 @@ module.exports = class ShieldsIoBadgeCommand extends Command { constructor(client) { super(client, { name: 'shields-io-badge', - aliases: ['shields-io', 'img-shields-io'], + aliases: ['shields-io'], group: 'image-edit', memberName: 'shields-io-badge', description: 'Creates a badge from shields.io.', diff --git a/commands/image-edit/square.js b/commands/image-edit/square.js index e292fb3d..3e02235b 100644 --- a/commands/image-edit/square.js +++ b/commands/image-edit/square.js @@ -6,7 +6,6 @@ module.exports = class SquareCommand extends Command { constructor(client) { super(client, { name: 'square', - aliases: ['square-avatar', 'square-ava', 'square-image', 'square-img'], group: 'image-edit', memberName: 'square', description: 'Draws an image or a user\'s avatar as a square.', diff --git a/commands/image-edit/vietnam-flashbacks.js b/commands/image-edit/vietnam-flashbacks.js index 9400c697..df329639 100644 --- a/commands/image-edit/vietnam-flashbacks.js +++ b/commands/image-edit/vietnam-flashbacks.js @@ -7,7 +7,7 @@ module.exports = class VietnamFlashbacksCommand extends Command { constructor(client) { super(client, { name: 'vietnam-flashbacks', - aliases: ['nam-flashbacks', 'vietnam', 'nam'], + aliases: ['nam-flashbacks', 'vietnam'], group: 'image-edit', memberName: 'vietnam-flashbacks', description: 'Edits Vietnam flashbacks behind an image or a user\'s avatar.', diff --git a/commands/info/avatar.js b/commands/info/avatar.js index 2d57b371..7713aff1 100644 --- a/commands/info/avatar.js +++ b/commands/info/avatar.js @@ -5,7 +5,7 @@ module.exports = class AvatarCommand extends Command { constructor(client) { super(client, { name: 'avatar', - aliases: ['profile-picture', 'profile-pic'], + aliases: ['profile-picture', 'profile-pic', 'pfp'], group: 'info', memberName: 'avatar', description: 'Responds with a user\'s avatar.', diff --git a/commands/info/channel.js b/commands/info/channel.js index 15c0fc34..177723b9 100644 --- a/commands/info/channel.js +++ b/commands/info/channel.js @@ -10,11 +10,11 @@ const types = { unknown: 'Unknown' }; -module.exports = class ChannelInfoCommand extends Command { +module.exports = class ChannelCommand extends Command { constructor(client) { super(client, { - name: 'channel-info', - aliases: ['channel'], + name: 'channel', + aliases: ['channel-info'], group: 'info', memberName: 'channel', description: 'Responds with detailed information on a channel.', diff --git a/commands/info/emoji-image.js b/commands/info/emoji-image.js index 61e39f91..a8939703 100644 --- a/commands/info/emoji-image.js +++ b/commands/info/emoji-image.js @@ -4,7 +4,7 @@ module.exports = class EmojiImageCommand extends Command { constructor(client) { super(client, { name: 'emoji-image', - aliases: ['bigify-emoji', 'emoji-url', 'big-emoji', 'emote-image', 'bigify-emote', 'emote-url', 'big-emote'], + aliases: ['big-emoji', 'emote-image', 'big-emote'], group: 'info', memberName: 'emoji-image', description: 'Responds with an emoji\'s full-scale image.', diff --git a/commands/info/emoji.js b/commands/info/emoji.js index 7cd17ae3..eb405900 100644 --- a/commands/info/emoji.js +++ b/commands/info/emoji.js @@ -2,11 +2,11 @@ const Command = require('../../structures/Command'); const moment = require('moment'); const { MessageEmbed } = require('discord.js'); -module.exports = class EmojiInfoCommand extends Command { +module.exports = class EmojiCommand extends Command { constructor(client) { super(client, { - name: 'emoji-info', - aliases: ['emoji', 'emote'], + name: 'emoji', + aliases: ['emoji-info', 'emote'], group: 'info', memberName: 'emoji', description: 'Responds with detailed information on an emoji.', diff --git a/commands/info/message.js b/commands/info/message.js index e3ac6d12..db5de698 100644 --- a/commands/info/message.js +++ b/commands/info/message.js @@ -1,11 +1,11 @@ const Command = require('../../structures/Command'); const { MessageEmbed } = require('discord.js'); -module.exports = class MessageInfoCommand extends Command { +module.exports = class MessageCommand extends Command { constructor(client) { super(client, { - name: 'message-info', - aliases: ['message', 'msg', 'msg-info', 'reply'], + name: 'message', + aliases: ['message-info', 'msg', 'msg-info', 'reply'], group: 'info', memberName: 'message', description: 'Responds with detailed information on a message.', diff --git a/commands/info/role.js b/commands/info/role.js index 9769e22a..cc9584f2 100644 --- a/commands/info/role.js +++ b/commands/info/role.js @@ -3,11 +3,11 @@ const moment = require('moment'); const { MessageEmbed } = require('discord.js'); const { util: { permissions } } = require('discord.js-commando'); -module.exports = class RoleInfoCommand extends Command { +module.exports = class RoleCommand extends Command { constructor(client) { super(client, { - name: 'role-info', - aliases: ['role'], + name: 'role', + aliases: ['role-info'], group: 'info', memberName: 'role', description: 'Responds with detailed information on a role.', diff --git a/commands/info/server.js b/commands/info/server.js index aa428b55..de73467e 100644 --- a/commands/info/server.js +++ b/commands/info/server.js @@ -4,11 +4,11 @@ const { MessageEmbed } = require('discord.js'); const filterLevels = ['Off', 'No Role', 'Everyone']; const verificationLevels = ['None', 'Low', 'Medium', '(╯°□°）╯︵ ┻━┻', '┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻']; -module.exports = class ServerInfoCommand extends Command { +module.exports = class ServerCommand extends Command { constructor(client) { super(client, { - name: 'server-info', - aliases: ['guild', 'server', 'guild-info'], + name: 'server', + aliases: ['guild', 'server-info', 'guild-info'], group: 'info', memberName: 'server', description: 'Responds with detailed information on the server.', diff --git a/commands/info/user.js b/commands/info/user.js index 8e7d5dc8..05c4e8c3 100644 --- a/commands/info/user.js +++ b/commands/info/user.js @@ -9,11 +9,11 @@ const activities = { LISTENING: 'Listening to' }; -module.exports = class UserInfoCommand extends Command { +module.exports = class UserCommand extends Command { constructor(client) { super(client, { - name: 'user-info', - aliases: ['user', 'member', 'member-info'], + name: 'user', + aliases: ['user-info', 'member', 'member-info'], group: 'info', memberName: 'user', description: 'Responds with detailed information on a user.', diff --git a/commands/number-edit/currency.js b/commands/number-edit/currency.js index da503352..e164796b 100644 --- a/commands/number-edit/currency.js +++ b/commands/number-edit/currency.js @@ -6,7 +6,6 @@ module.exports = class CurrencyCommand extends Command { constructor(client) { super(client, { name: 'currency', - aliases: ['currency-convert', 'convert-currency'], group: 'number-edit', memberName: 'currency', description: 'Converts currency from one currency to another.', diff --git a/commands/number-edit/final-grade.js b/commands/number-edit/final-grade.js index 490866ba..487cea5a 100644 --- a/commands/number-edit/final-grade.js +++ b/commands/number-edit/final-grade.js @@ -1,11 +1,11 @@ const Command = require('../../structures/Command'); -const { above100, above92, above88, above80, below80 } = require('../../assets/json/final-grade-calculator'); +const { above100, above92, above88, above80, below80 } = require('../../assets/json/final-grade'); module.exports = class FinalGradeCommand extends Command { constructor(client) { super(client, { name: 'final-grade', - aliases: ['final-grade-calculator', 'final-grade-calc', 'roger-hub'], + aliases: ['final-grade-calculator', 'final-grade-calc'], group: 'number-edit', memberName: 'final-grade', description: 'Determines the grade you need to make on your final to get your desired course grade.', diff --git a/commands/number-edit/roman-numeral.js b/commands/number-edit/roman.js similarity index 75% rename from commands/number-edit/roman-numeral.js rename to commands/number-edit/roman.js index 4a0749cb..2a6cf05c 100644 --- a/commands/number-edit/roman-numeral.js +++ b/commands/number-edit/roman.js @@ -1,13 +1,13 @@ const Command = require('../../structures/Command'); -const numerals = require('../../assets/json/roman-numeral'); +const numerals = require('../../assets/json/roman'); -module.exports = class RomanNumeralCommand extends Command { +module.exports = class RomanCommand extends Command { constructor(client) { super(client, { - name: 'roman-numeral', - aliases: ['roman'], + name: 'roman', + aliases: ['roman-numeral'], group: 'number-edit', - memberName: 'roman-numeral', + memberName: 'roman', description: 'Converts a number to roman numerals.', args: [ { diff --git a/commands/number-edit/scientific-notation.js b/commands/number-edit/scientific-notation.js index fa3e8f2a..662a6961 100644 --- a/commands/number-edit/scientific-notation.js +++ b/commands/number-edit/scientific-notation.js @@ -4,7 +4,7 @@ module.exports = class ScientificNotationCommand extends Command { constructor(client) { super(client, { name: 'scientific-notation', - aliases: ['science-notation', 'e+', 'exponential-notation', 'exponential', 'scientific'], + aliases: ['science-notation', 'exponential-notation'], group: 'number-edit', memberName: 'scientific-notation', description: 'Converts a number to scientific notation.', diff --git a/commands/number-edit/units.js b/commands/number-edit/units.js index 37323d1a..76fa25f6 100644 --- a/commands/number-edit/units.js +++ b/commands/number-edit/units.js @@ -6,7 +6,7 @@ module.exports = class UnitsCommand extends Command { constructor(client) { super(client, { name: 'units', - aliases: ['convert-units', 'unit-converter', 'unit', 'convert'], + aliases: ['convert'], group: 'number-edit', memberName: 'units', description: 'Converts units to/from other units.', diff --git a/commands/random/advice-slip.js b/commands/random/advice.js similarity index 79% rename from commands/random/advice-slip.js rename to commands/random/advice.js index 25c543fe..a78d5743 100644 --- a/commands/random/advice-slip.js +++ b/commands/random/advice.js @@ -1,13 +1,13 @@ const Command = require('../../structures/Command'); const request = require('node-superfetch'); -module.exports = class AdviceSlipCommand extends Command { +module.exports = class AdviceCommand extends Command { constructor(client) { super(client, { - name: 'advice-slip', - aliases: ['advice'], + name: 'advice', + aliases: ['advice-slip'], group: 'random', - memberName: 'advice-slip', + memberName: 'advice', description: 'Responds with a random bit of advice.' }); } diff --git a/commands/random/charlie-charlie-challenge.js b/commands/random/charlie-charlie.js similarity index 85% rename from commands/random/charlie-charlie-challenge.js rename to commands/random/charlie-charlie.js index 0109abf2..c2865177 100644 --- a/commands/random/charlie-charlie-challenge.js +++ b/commands/random/charlie-charlie.js @@ -2,13 +2,13 @@ const Command = require('../../structures/Command'); const { stripIndent } = require('common-tags'); const answers = ['yes', 'no']; -module.exports = class CharlieCharlieChallengeCommand extends Command { +module.exports = class CharlieCharlieCommand extends Command { constructor(client) { super(client, { - name: 'charlie-charlie-challenge', - aliases: ['charlie-charlie'], + name: 'charlie-charlie', + aliases: ['charlie-charlie-challenge'], group: 'random', - memberName: 'charlie-charlie-challenge', + memberName: 'charlie-charlie', description: 'Asks your question to Charlie.', args: [ { diff --git a/commands/random/chuck-norris.js b/commands/random/chuck-norris.js index dae3f298..52622c67 100644 --- a/commands/random/chuck-norris.js +++ b/commands/random/chuck-norris.js @@ -5,7 +5,7 @@ module.exports = class ChuckNorrisCommand extends Command { constructor(client) { super(client, { name: 'chuck-norris', - aliases: ['chuck', 'norris'], + aliases: ['norris'], group: 'random', memberName: 'chuck-norris', description: 'Responds with a random Chuck Norris joke.', diff --git a/commands/random/discord-email-fun-fact.js b/commands/random/discord-email-fun-fact.js deleted file mode 100644 index 094f3e63..00000000 --- a/commands/random/discord-email-fun-fact.js +++ /dev/null @@ -1,19 +0,0 @@ -const Command = require('../../structures/Command'); -const facts = require('../../assets/json/discord-email-fun-fact'); - -module.exports = class DiscordEmailFunFactCommand extends Command { - constructor(client) { - super(client, { - name: 'discord-email-fun-fact', - aliases: ['email-fun-fact'], - group: 'random', - memberName: 'discord-email-fun-fact', - description: 'Responds with a random fun fact from the Discord emails.' - }); - } - - run(msg) { - const factNumber = Math.floor(Math.random() * facts.length); - return msg.say(`**Fun Fact #${factNumber + 1}:** ${facts[factNumber]}`); - } -}; diff --git a/commands/random/draw-cards.js b/commands/random/draw-cards.js index e93dd60a..27f6567f 100644 --- a/commands/random/draw-cards.js +++ b/commands/random/draw-cards.js @@ -7,7 +7,7 @@ module.exports = class DrawCardsCommand extends Command { constructor(client) { super(client, { name: 'draw-cards', - aliases: ['card-hand', 'draw-hand'], + aliases: ['draw-hand'], group: 'random', memberName: 'draw-cards', description: 'Draws a random hand of playing cards.', diff --git a/commands/random/duck.js b/commands/random/duck.js index 62690d25..24c63a55 100644 --- a/commands/random/duck.js +++ b/commands/random/duck.js @@ -5,7 +5,7 @@ module.exports = class DuckCommand extends Command { constructor(client) { super(client, { name: 'duck', - aliases: ['quack', 'ducky'], + aliases: ['ducky'], group: 'random', memberName: 'duck', description: 'Responds with a random duck image.', diff --git a/commands/random/fact.js b/commands/random/fact.js index a838fc4f..d26969e0 100644 --- a/commands/random/fact.js +++ b/commands/random/fact.js @@ -5,7 +5,6 @@ module.exports = class FactCommand extends Command { constructor(client) { super(client, { name: 'fact', - aliases: ['wikifakt'], group: 'random', memberName: 'fact', description: 'Responds with a random fact.' diff --git a/commands/random/oracle-turret.js b/commands/random/oracle-turret.js index bbba05b5..7fb81830 100644 --- a/commands/random/oracle-turret.js +++ b/commands/random/oracle-turret.js @@ -5,7 +5,6 @@ module.exports = class OracleTurretCommand extends Command { constructor(client) { super(client, { name: 'oracle-turret', - aliases: ['im-different'], group: 'random', memberName: 'oracle-turret', description: 'Responds with a random Oracle Turret quote.' diff --git a/commands/random/reddit.js b/commands/random/subreddit.js similarity index 86% rename from commands/random/reddit.js rename to commands/random/subreddit.js index af213c25..951a1dc6 100644 --- a/commands/random/reddit.js +++ b/commands/random/subreddit.js @@ -2,13 +2,13 @@ const SubredditCommand = require('../../structures/commands/Subreddit'); const { MessageEmbed } = require('discord.js'); const { formatNumber } = require('../../util/Util'); -module.exports = class RedditCommand extends SubredditCommand { +module.exports = class SubredditCommand extends SubredditCommand { constructor(client) { super(client, { - name: 'reddit', - aliases: ['subreddit', 'r', 'r/', 'sub'], + name: 'subreddit', + aliases: ['r/', 'sub'], group: 'random', - memberName: 'reddit', + memberName: 'subreddit', description: 'Responds with a random post from a subreddit.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/anime.js b/commands/search/anime.js index 9f283218..093508c2 100644 --- a/commands/search/anime.js +++ b/commands/search/anime.js @@ -32,7 +32,7 @@ module.exports = class AnimeCommand extends Command { constructor(client) { super(client, { name: 'anime', - aliases: ['anilist-anime', 'anilist', 'mal'], + aliases: ['anilist-anime', 'anilist'], group: 'search', memberName: 'anime', description: 'Searches AniList for your query, getting anime results.', diff --git a/commands/search/azur-lane-ship.js b/commands/search/azur-lane.js similarity index 93% rename from commands/search/azur-lane-ship.js rename to commands/search/azur-lane.js index f90d6e98..195ff6a5 100644 --- a/commands/search/azur-lane-ship.js +++ b/commands/search/azur-lane.js @@ -4,13 +4,13 @@ const request = require('node-superfetch'); const { stripIndents } = require('common-tags'); const { formatNumber } = require('../../util/Util'); -module.exports = class AzurLaneShipCommand extends Command { +module.exports = class AzurLaneCommand extends Command { constructor(client) { super(client, { - name: 'azur-lane-ship', - aliases: ['azure-lane-ship', 'azur-lane', 'azure-lane', 'azur', 'azure'], + name: 'azur-lane', + aliases: ['azur-lane-ship', 'azur'], group: 'search', - memberName: 'azur-lane-ship', + memberName: 'azur-lane', description: 'Responds with information on an Azur Lane ship.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/google-book.js b/commands/search/book.js similarity index 91% rename from commands/search/google-book.js rename to commands/search/book.js index a5d0ff3d..7802d750 100644 --- a/commands/search/google-book.js +++ b/commands/search/book.js @@ -4,13 +4,13 @@ const request = require('node-superfetch'); const { shorten, formatNumber } = require('../../util/Util'); const { GOOGLE_KEY } = process.env; -module.exports = class GoogleBookCommand extends Command { +module.exports = class BookCommand extends Command { constructor(client) { super(client, { - name: 'google-book', - aliases: ['google-books', 'book'], + name: 'book', + aliases: ['google-book', 'google-books'], group: 'search', - memberName: 'google-book', + memberName: 'book', description: 'Searches Google Books for a book.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/bulbapedia.js b/commands/search/bulbapedia.js index c08fc3a4..823a9d63 100644 --- a/commands/search/bulbapedia.js +++ b/commands/search/bulbapedia.js @@ -7,7 +7,6 @@ module.exports = class BulbapediaCommand extends Command { constructor(client) { super(client, { name: 'bulbapedia', - aliases: ['bulbagarden', 'bulbapedia-article', 'bulbagarden-article'], group: 'search', memberName: 'bulbapedia', description: 'Searches Bulbapedia for your query.', diff --git a/commands/search/dictionary.js b/commands/search/define.js similarity index 83% rename from commands/search/dictionary.js rename to commands/search/define.js index 14653032..3b2051b2 100644 --- a/commands/search/dictionary.js +++ b/commands/search/define.js @@ -3,13 +3,13 @@ const request = require('node-superfetch'); const { stripIndents } = require('common-tags'); const { WORDNIK_KEY } = process.env; -module.exports = class DictionaryCommand extends Command { +module.exports = class DefineCommand extends Command { constructor(client) { super(client, { - name: 'dictionary', - aliases: ['define', 'wordnik', 'define-wordnik', 'wordnik-define', 'wordnik-dictionary'], + name: 'define', + aliases: ['dictionary', 'wordnik'], group: 'search', - memberName: 'dictionary', + memberName: 'define', description: 'Defines a word.', args: [ { diff --git a/commands/search/derpibooru.js b/commands/search/derpibooru.js index 7235b655..4663ac74 100644 --- a/commands/search/derpibooru.js +++ b/commands/search/derpibooru.js @@ -5,7 +5,6 @@ module.exports = class DerpibooruCommand extends Command { constructor(client) { super(client, { name: 'derpibooru', - aliases: ['derpibooru-image'], group: 'search', memberName: 'derpibooru', description: 'Responds with an image from Derpibooru.', diff --git a/commands/search/discord-js-docs.js b/commands/search/docs.js similarity index 86% rename from commands/search/discord-js-docs.js rename to commands/search/docs.js index c2763985..0d2a6888 100644 --- a/commands/search/discord-js-docs.js +++ b/commands/search/docs.js @@ -2,13 +2,13 @@ const Command = require('../../structures/Command'); const request = require('node-superfetch'); const branches = ['stable', 'master', 'rpc', 'commando']; -module.exports = class DiscordJSDocsCommand extends Command { +module.exports = class DocsCommand extends Command { constructor(client) { super(client, { - name: 'discord-js-docs', - aliases: ['djs-docs', 'docs', 'djs', 'discord-js'], + name: 'docs', + aliases: ['discord-js-docs', 'djs-docs', 'djs', 'discord-js'], group: 'search', - memberName: 'discord-js-docs', + memberName: 'docs', description: 'Searches the Discord.js docs for your query.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/esrb.js b/commands/search/esrb.js index ecf1114d..ac37dfde 100644 --- a/commands/search/esrb.js +++ b/commands/search/esrb.js @@ -15,7 +15,6 @@ module.exports = class ESRBCommand extends Command { constructor(client) { super(client, { name: 'esrb', - aliases: ['esrb-rating'], group: 'search', memberName: 'esrb', description: 'Searches ESRB for your query.', diff --git a/commands/search/flickr.js b/commands/search/flickr.js index 548186a6..5edc5274 100644 --- a/commands/search/flickr.js +++ b/commands/search/flickr.js @@ -6,7 +6,6 @@ module.exports = class FlickrCommand extends Command { constructor(client) { super(client, { name: 'flickr', - aliases: ['flickr-image'], group: 'search', memberName: 'flickr', description: 'Searches Flickr for your query.', diff --git a/commands/search/giphy.js b/commands/search/giphy.js index 4b0340eb..6f934a91 100644 --- a/commands/search/giphy.js +++ b/commands/search/giphy.js @@ -6,7 +6,7 @@ module.exports = class GiphyCommand extends Command { constructor(client) { super(client, { name: 'giphy', - aliases: ['gif', 'giphy-gif'], + aliases: ['gif'], group: 'search', memberName: 'giphy', description: 'Searches Giphy for your query.', diff --git a/commands/search/github.js b/commands/search/github.js index c13a2382..d01f5cb6 100644 --- a/commands/search/github.js +++ b/commands/search/github.js @@ -9,7 +9,7 @@ module.exports = class GithubCommand extends Command { constructor(client) { super(client, { name: 'github', - aliases: ['github-repository', 'github-repo', 'git-repo', 'gh'], + aliases: ['repo', 'gh'], group: 'search', memberName: 'github', description: 'Responds with information on a GitHub repository.', diff --git a/commands/search/google.js b/commands/search/google.js index b5d7786e..c6710fc4 100644 --- a/commands/search/google.js +++ b/commands/search/google.js @@ -8,7 +8,7 @@ module.exports = class GoogleCommand extends Command { constructor(client) { super(client, { name: 'google', - aliases: ['google-search', 'search-google'], + aliases: ['search'], group: 'search', memberName: 'google', description: 'Searches Google for your query.', diff --git a/commands/search/imgur.js b/commands/search/imgur.js index 3198eea0..a1bfa7b3 100644 --- a/commands/search/imgur.js +++ b/commands/search/imgur.js @@ -6,7 +6,6 @@ module.exports = class ImgurCommand extends Command { constructor(client) { super(client, { name: 'imgur', - aliases: ['imgur-image', 'image'], group: 'search', memberName: 'imgur', description: 'Searches Imgur for your query.', diff --git a/commands/search/itunes.js b/commands/search/itunes.js index 151c3c44..85879d5f 100644 --- a/commands/search/itunes.js +++ b/commands/search/itunes.js @@ -7,7 +7,6 @@ module.exports = class ItunesCommand extends Command { constructor(client) { super(client, { name: 'itunes', - aliases: ['song', 'music', 'apple-music', 'itunes-music'], group: 'search', memberName: 'itunes', description: 'Searches iTunes for your query.', diff --git a/commands/search/kh-wiki.js b/commands/search/kh-wiki.js index a89e7726..11e565cf 100644 --- a/commands/search/kh-wiki.js +++ b/commands/search/kh-wiki.js @@ -7,7 +7,7 @@ module.exports = class KhWikiCommand extends Command { constructor(client) { super(client, { name: 'kh-wiki', - aliases: ['kingdom-hearts-wiki', 'kh-wiki-article', 'kingdom-hearts-wiki-article'], + aliases: ['kingdom-hearts-wiki'], group: 'search', memberName: 'kh-wiki', description: 'Searches the Kingdom Hearts Wiki for your query.', diff --git a/commands/search/kickstarter.js b/commands/search/kickstarter.js index 96e2dac9..b3eaea36 100644 --- a/commands/search/kickstarter.js +++ b/commands/search/kickstarter.js @@ -8,7 +8,6 @@ module.exports = class KickstarterCommand extends Command { constructor(client) { super(client, { name: 'kickstarter', - aliases: ['kickstarter-project'], group: 'search', memberName: 'kickstarter', description: 'Searches Kickstarter for your query.', diff --git a/commands/search/league-of-legends-champion.js b/commands/search/league-of-legends.js similarity index 94% rename from commands/search/league-of-legends-champion.js rename to commands/search/league-of-legends.js index d1466227..36fe70de 100644 --- a/commands/search/league-of-legends-champion.js +++ b/commands/search/league-of-legends.js @@ -3,13 +3,13 @@ const { MessageEmbed } = require('discord.js'); const request = require('node-superfetch'); const buttons = ['Q', 'W', 'E', 'R']; -module.exports = class LeagueOfLegendsChampionCommand extends Command { +module.exports = class LeagueOfLegendsCommand extends Command { constructor(client) { super(client, { - name: 'league-of-legends-champion', - aliases: ['lol-champion', 'league-of-legends-champ', 'lol-champ', 'league-champ'], + name: 'league-of-legends', + aliases: ['league-of-legends-champion', 'league-of-legends-champ', 'league-champ'], group: 'search', - memberName: 'league-of-legends-champion', + memberName: 'league-of-legends', description: 'Responds with information on a League of Legends champion.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/google-map.js b/commands/search/map.js similarity index 90% rename from commands/search/google-map.js rename to commands/search/map.js index 6f5c7669..50f585e9 100644 --- a/commands/search/google-map.js +++ b/commands/search/map.js @@ -2,13 +2,13 @@ const Command = require('../../structures/Command'); const request = require('node-superfetch'); const { GOOGLE_KEY } = process.env; -module.exports = class GoogleMapCommand extends Command { +module.exports = class MapCommand extends Command { constructor(client) { super(client, { - name: 'google-map', - aliases: ['google-maps', 'map'], + name: 'map', + aliases: ['google-maps', 'google-map'], group: 'search', - memberName: 'google-map', + memberName: 'map', description: 'Responds with a map of a specific location.', clientPermissions: ['ATTACH_FILES'], args: [ diff --git a/commands/search/mayo-clinic.js b/commands/search/mayo-clinic.js index 36d66e52..102a3639 100644 --- a/commands/search/mayo-clinic.js +++ b/commands/search/mayo-clinic.js @@ -8,7 +8,7 @@ module.exports = class MayoClinicCommand extends Command { constructor(client) { super(client, { name: 'mayo-clinic', - aliases: ['disease', 'diagnose', 'diagnosis'], + aliases: ['disease'], group: 'search', memberName: 'mayo-clinic', description: 'Searches Mayo Clinic for your query.', diff --git a/commands/search/mdn.js b/commands/search/mdn.js index 9ebba173..36e9183a 100644 --- a/commands/search/mdn.js +++ b/commands/search/mdn.js @@ -6,7 +6,6 @@ module.exports = class MDNCommand extends Command { constructor(client) { super(client, { name: 'mdn', - aliases: ['mozilla-developer-network'], group: 'search', memberName: 'mdn', description: 'Searches MDN for your query.', diff --git a/commands/search/tmdb-movie.js b/commands/search/movie.js similarity index 93% rename from commands/search/tmdb-movie.js rename to commands/search/movie.js index 9acdf57b..51bda7b3 100644 --- a/commands/search/tmdb-movie.js +++ b/commands/search/movie.js @@ -4,13 +4,13 @@ const request = require('node-superfetch'); const { shorten } = require('../../util/Util'); const { TMDB_KEY } = process.env; -module.exports = class TMDBMovieCommand extends Command { +module.exports = class MovieCommand extends Command { constructor(client) { super(client, { - name: 'tmdb-movie', - aliases: ['movie', 'imdb'], + name: 'movie', + aliases: ['tmdb-movie', 'imdb'], group: 'search', - memberName: 'tmdb-movie', + memberName: 'movie', description: 'Searches TMDB for your query, getting movie results.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/nasa.js b/commands/search/nasa.js index b0df22cc..3476b1b9 100644 --- a/commands/search/nasa.js +++ b/commands/search/nasa.js @@ -6,7 +6,6 @@ module.exports = class NASACommand extends Command { constructor(client) { super(client, { name: 'nasa', - aliases: ['nasa-image'], group: 'search', memberName: 'nasa', description: 'Searches NASA\'s image archive for your query.', diff --git a/commands/search/neopet.js b/commands/search/neopet.js index fc0eed11..d16dc418 100644 --- a/commands/search/neopet.js +++ b/commands/search/neopet.js @@ -13,7 +13,6 @@ module.exports = class NeopetCommand extends Command { constructor(client) { super(client, { name: 'neopet', - aliases: ['neopets-pet', 'neopet-image', 'neopet-image-finder', 'neo'], group: 'search', memberName: 'neopet', description: 'Responds with the image of a specific Neopet.', diff --git a/commands/search/neopets-item.js b/commands/search/neopets-item.js index ccbcbcb1..ddd55a97 100644 --- a/commands/search/neopets-item.js +++ b/commands/search/neopets-item.js @@ -7,7 +7,7 @@ module.exports = class NeopetsItemCommand extends Command { constructor(client) { super(client, { name: 'neopets-item', - aliases: ['jellyneo', 'jellyneo-item', 'jellyneo-item-database', 'neo-item'], + aliases: ['neo-item'], group: 'search', memberName: 'neopets-item', description: 'Responds with information on a specific Neopets item.', diff --git a/commands/search/npm.js b/commands/search/npm.js index adbaa457..35688e11 100644 --- a/commands/search/npm.js +++ b/commands/search/npm.js @@ -8,7 +8,6 @@ module.exports = class NPMCommand extends Command { constructor(client) { super(client, { name: 'npm', - aliases: ['npm-package'], group: 'search', memberName: 'npm', description: 'Responds with information on an NPM package.', diff --git a/commands/search/osu.js b/commands/search/osu.js index 9518846f..759cb54e 100644 --- a/commands/search/osu.js +++ b/commands/search/osu.js @@ -8,7 +8,6 @@ module.exports = class OsuCommand extends Command { constructor(client) { super(client, { name: 'osu', - aliases: ['osu-user', 'osu-stats'], group: 'search', memberName: 'osu', description: 'Responds with information on an osu! user.', diff --git a/commands/search/periodic-table.js b/commands/search/periodic-table.js index 5c59afe9..2721c751 100644 --- a/commands/search/periodic-table.js +++ b/commands/search/periodic-table.js @@ -8,7 +8,7 @@ module.exports = class PeriodicTableCommand extends Command { constructor(client) { super(client, { name: 'periodic-table', - aliases: ['periodic-table-of-elements', 'element', 'p-table'], + aliases: ['element', 'p-table'], group: 'search', memberName: 'periodic-table', description: 'Finds an element on the periodic table.', diff --git a/commands/search/reddit-user.js b/commands/search/reddit.js similarity index 90% rename from commands/search/reddit-user.js rename to commands/search/reddit.js index 031bc362..ffdc3701 100644 --- a/commands/search/reddit-user.js +++ b/commands/search/reddit.js @@ -4,13 +4,13 @@ const request = require('node-superfetch'); const moment = require('moment'); const { formatNumber } = require('../../util/Util'); -module.exports = class RedditUserCommand extends Command { +module.exports = class RedditCommand extends Command { constructor(client) { super(client, { - name: 'reddit-user', - aliases: ['reddit-u', 'u/', 'karma', 'reddit-karma'], + name: 'reddit', + aliases: ['u/'], group: 'search', - memberName: 'reddit-user', + memberName: 'reddit', description: 'Responds with information on a Reddit user.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/rule-of-the-internet.js b/commands/search/rule.js similarity index 60% rename from commands/search/rule-of-the-internet.js rename to commands/search/rule.js index 7257452d..f7fec54a 100644 --- a/commands/search/rule-of-the-internet.js +++ b/commands/search/rule.js @@ -1,13 +1,13 @@ const Command = require('../../structures/Command'); -const rules = require('../../assets/json/rule-of-the-internet'); +const rules = require('../../assets/json/rule'); -module.exports = class RuleOfTheInternetCommand extends Command { +module.exports = class RuleCommand extends Command { constructor(client) { super(client, { - name: 'rule-of-the-internet', - aliases: ['rules-of-the-internet', 'internet-rule', 'rule', 'rules'], + name: 'rule', + aliases: ['rule-of-the-internet'], group: 'search', - memberName: 'rule-of-the-internet', + memberName: 'rule', description: 'Responds with a rule of the internet.', args: [ { diff --git a/commands/search/safebooru.js b/commands/search/safebooru.js index 624cf48c..3ee74152 100644 --- a/commands/search/safebooru.js +++ b/commands/search/safebooru.js @@ -5,7 +5,6 @@ module.exports = class SafebooruCommand extends Command { constructor(client) { super(client, { name: 'safebooru', - aliases: ['safebooru-image'], group: 'search', memberName: 'safebooru', description: 'Responds with an image from Safebooru, with optional query.', diff --git a/commands/search/soundcloud.js b/commands/search/soundcloud.js index 3317448d..733ad358 100644 --- a/commands/search/soundcloud.js +++ b/commands/search/soundcloud.js @@ -9,7 +9,7 @@ module.exports = class SoundcloudCommand extends Command { constructor(client) { super(client, { name: 'soundcloud', - aliases: ['soundcloud-song', 'soundcloud-music', 'scloud', 'scloud-song', 'scloud-music', 'sc'], + aliases: ['scloud', 'sc'], group: 'search', memberName: 'soundcloud', description: 'Searches SoundCloud for your query.', diff --git a/commands/search/stack-overflow.js b/commands/search/stack-overflow.js index bc25cbc0..78cccfa3 100644 --- a/commands/search/stack-overflow.js +++ b/commands/search/stack-overflow.js @@ -9,7 +9,6 @@ module.exports = class StackOverflowCommand extends Command { constructor(client) { super(client, { name: 'stack-overflow', - aliases: ['stack-exchange'], group: 'search', memberName: 'stack-overflow', description: 'Searches Stack Overflow for your query.', diff --git a/commands/search/steam.js b/commands/search/steam.js index 4272f066..f2a0104d 100644 --- a/commands/search/steam.js +++ b/commands/search/steam.js @@ -7,7 +7,6 @@ module.exports = class SteamCommand extends Command { constructor(client) { super(client, { name: 'steam', - aliases: ['steam-game', 'game', 'video-game'], group: 'search', memberName: 'steam', description: 'Searches Steam for your query.', diff --git a/commands/search/tenor.js b/commands/search/tenor.js index 39c4a14b..a247c1b2 100644 --- a/commands/search/tenor.js +++ b/commands/search/tenor.js @@ -6,7 +6,6 @@ module.exports = class TenorCommand extends Command { constructor(client) { super(client, { name: 'tenor', - aliases: ['tenor-gif'], group: 'search', memberName: 'tenor', description: 'Searches Tenor for your query.', diff --git a/commands/search/tumblr.js b/commands/search/tumblr.js index d312edca..d1d01a2d 100644 --- a/commands/search/tumblr.js +++ b/commands/search/tumblr.js @@ -8,7 +8,6 @@ module.exports = class TumblrCommand extends Command { constructor(client) { super(client, { name: 'tumblr', - aliases: ['tumblr-blog'], group: 'search', memberName: 'tumblr', description: 'Responds with information on a Tumblr blog.', diff --git a/commands/search/tmdb-tv-show.js b/commands/search/tv-show.js similarity index 93% rename from commands/search/tmdb-tv-show.js rename to commands/search/tv-show.js index 91dcf630..ca2a91cd 100644 --- a/commands/search/tmdb-tv-show.js +++ b/commands/search/tv-show.js @@ -4,13 +4,13 @@ const request = require('node-superfetch'); const { shorten, formatNumber } = require('../../util/Util'); const { TMDB_KEY } = process.env; -module.exports = class TMDBTVShowCommand extends Command { +module.exports = class TvShowCommand extends Command { constructor(client) { super(client, { - name: 'tmdb-tv-show', - aliases: ['tv-show', 'tv', 'tmdb-tv'], + name: 'tv-show', + aliases: ['tmdb-tv-show', 'tv', 'tmdb-tv'], group: 'search', - memberName: 'tmdb-tv-show', + memberName: 'tv-show', description: 'Searches TMDB for your query, getting TV show results.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/twitter.js b/commands/search/twitter.js index 603cd5b2..2a2195b6 100644 --- a/commands/search/twitter.js +++ b/commands/search/twitter.js @@ -10,7 +10,6 @@ module.exports = class TwitterCommand extends Command { constructor(client) { super(client, { name: 'twitter', - aliases: ['twitter-user'], group: 'search', memberName: 'twitter', description: 'Responds with information on a Twitter user.', diff --git a/commands/search/urban-dictionary.js b/commands/search/urban.js similarity index 89% rename from commands/search/urban-dictionary.js rename to commands/search/urban.js index 90f4fe8a..b0d52284 100644 --- a/commands/search/urban-dictionary.js +++ b/commands/search/urban.js @@ -3,13 +3,13 @@ const { MessageEmbed } = require('discord.js'); const request = require('node-superfetch'); const { shorten, formatNumber } = require('../../util/Util'); -module.exports = class UrbanDictionaryCommand extends Command { +module.exports = class UrbanCommand extends Command { constructor(client) { super(client, { - name: 'urban-dictionary', - aliases: ['urban', 'define-urban'], + name: 'urban', + aliases: ['urban-dictionary'], group: 'search', - memberName: 'urban-dictionary', + memberName: 'urban', description: 'Defines a word, but with Urban Dictionary.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/vndb.js b/commands/search/visual-novel.js similarity index 93% rename from commands/search/vndb.js rename to commands/search/visual-novel.js index d8286d49..4e8cd3da 100644 --- a/commands/search/vndb.js +++ b/commands/search/visual-novel.js @@ -3,13 +3,13 @@ const request = require('node-superfetch'); const { MessageEmbed } = require('discord.js'); const { shorten } = require('../../util/Util'); -module.exports = class VNDBCommand extends Command { +module.exports = class VisualNovelCommand extends Command { constructor(client) { super(client, { - name: 'vndb', - aliases: ['visual-novel', 'vn'], + name: 'visual-novel', + aliases: ['vndb', 'vn'], group: 'search', - memberName: 'vndb', + memberName: 'visual-novel', description: 'Responds with information on a Visual Novel.', clientPermissions: ['EMBED_LINKS'], args: [ diff --git a/commands/search/vocadb.js b/commands/search/vocadb.js index a6f32201..fcb558a3 100644 --- a/commands/search/vocadb.js +++ b/commands/search/vocadb.js @@ -4,11 +4,11 @@ const { MessageEmbed } = require('discord.js'); const request = require('node-superfetch'); const { shorten } = require('../../util/Util'); -module.exports = class VocaDBCommand extends Command { +module.exports = class VocadbCommand extends Command { constructor(client) { super(client, { name: 'vocadb', - aliases: ['vocaloid', 'vocaloid-song', 'vocaloid-music'], + aliases: ['vocaloid'], group: 'search', memberName: 'vocadb', description: 'Searches VocaDB for your query.', diff --git a/commands/search/wattpad.js b/commands/search/wattpad.js index 683e5b74..79ea29aa 100644 --- a/commands/search/wattpad.js +++ b/commands/search/wattpad.js @@ -9,7 +9,6 @@ module.exports = class WattpadCommand extends Command { constructor(client) { super(client, { name: 'wattpad', - aliases: ['wattpad-book'], group: 'search', memberName: 'wattpad', description: 'Searches Wattpad for your query.', diff --git a/commands/search/wikia.js b/commands/search/wikia.js index a83e59f3..ae3850ec 100644 --- a/commands/search/wikia.js +++ b/commands/search/wikia.js @@ -7,7 +7,7 @@ module.exports = class WikiaCommand extends Command { constructor(client) { super(client, { name: 'wikia', - aliases: ['fandom', 'wikia-article', 'fandom-article'], + aliases: ['fandom'], group: 'search', memberName: 'wikia', description: 'Searches a specific Wikia wiki for your query.', diff --git a/commands/search/wikihow.js b/commands/search/wikihow.js index 1e8b43b4..0b8b7927 100644 --- a/commands/search/wikihow.js +++ b/commands/search/wikihow.js @@ -6,7 +6,7 @@ module.exports = class WikihowCommand extends Command { constructor(client) { super(client, { name: 'wikihow', - aliases: ['wikihow-article', 'how-to', 'how'], + aliases: ['how-to', 'how'], group: 'search', memberName: 'wikihow', description: 'Searches Wikihow for your query.', diff --git a/commands/search/wikipedia.js b/commands/search/wikipedia.js index 19f27c67..8f4ac596 100644 --- a/commands/search/wikipedia.js +++ b/commands/search/wikipedia.js @@ -7,7 +7,6 @@ module.exports = class WikipediaCommand extends Command { constructor(client) { super(client, { name: 'wikipedia', - aliases: ['wikipedia-article'], group: 'search', memberName: 'wikipedia', description: 'Searches Wikipedia for your query.', diff --git a/commands/search/youtube.js b/commands/search/youtube.js index fd5e51d0..a03acdfe 100644 --- a/commands/search/youtube.js +++ b/commands/search/youtube.js @@ -8,7 +8,7 @@ module.exports = class YoutubeCommand extends Command { constructor(client) { super(client, { name: 'youtube', - aliases: ['youtube-video', 'y-tube', 'u-tube', 'yt'], + aliases: ['y-tube', 'u-tube', 'yt'], group: 'search', memberName: 'youtube', description: 'Searches YouTube for your query.', diff --git a/commands/search/yu-gi-oh.js b/commands/search/yu-gi-oh.js index ba7574b3..a5a8d8dc 100644 --- a/commands/search/yu-gi-oh.js +++ b/commands/search/yu-gi-oh.js @@ -7,7 +7,7 @@ module.exports = class YuGiOhCommand extends Command { constructor(client) { super(client, { name: 'yu-gi-oh', - aliases: ['yu-gi-oh-card', 'ygo-card', 'ygo'], + aliases: ['ygo'], group: 'search', memberName: 'yu-gi-oh', description: 'Responds with info on a Yu-Gi-Oh! card.', diff --git a/commands/single/dark-theme-light-theme.js b/commands/single/dark-light.js similarity index 72% rename from commands/single/dark-theme-light-theme.js rename to commands/single/dark-light.js index 734c1739..5a24fa9a 100644 --- a/commands/single/dark-theme-light-theme.js +++ b/commands/single/dark-light.js @@ -3,13 +3,13 @@ const path = require('path'); const { list } = require('../../util/Util'); const types = ['default', 'moth']; -module.exports = class DarkThemeLightThemeCommand extends Command { +module.exports = class DarkLightCommand extends Command { constructor(client) { super(client, { - name: 'dark-theme-light-theme', - aliases: ['light-theme-dark-theme', 'dark-theme', 'light-theme', 'dark-light', 'dtlt'], + name: 'dark-light', + aliases: ['dark-theme-light-theme', 'light-theme-dark-theme', 'dark-theme', 'light-theme', 'dtlt'], group: 'single', - memberName: 'dark-theme-light-theme', + memberName: 'dark-light', description: 'Determines whether you use dark or light theme.', details: `**Types:** ${types.join(', ')}`, clientPermissions: ['ATTACH_FILES'], @@ -28,7 +28,7 @@ module.exports = class DarkThemeLightThemeCommand extends Command { run(msg, { type }) { return msg.say({ - files: [path.join(__dirname, '..', '..', 'assets', 'images', 'dark-theme-light-theme', `${type}.png`)] + files: [path.join(__dirname, '..', '..', 'assets', 'images', 'dark-light', `${type}.png`)] }); } }; diff --git a/commands/single/eat-pant.js b/commands/single/eat-pant.js index 08edbe74..c14e4969 100644 --- a/commands/single/eat-pant.js +++ b/commands/single/eat-pant.js @@ -5,6 +5,7 @@ module.exports = class EatPantCommand extends Command { constructor(client) { super(client, { name: 'eat-pant', + aliases: ['bort-sampson'], group: 'single', memberName: 'eat-pant', description: 'Eat pant.', diff --git a/commands/single/fly.js b/commands/single/fly.js index 85bd950a..87ba83e0 100644 --- a/commands/single/fly.js +++ b/commands/single/fly.js @@ -7,7 +7,6 @@ module.exports = class FlyCommand extends Command { constructor(client) { super(client, { name: 'fly', - aliases: ['fly-prank'], group: 'single', memberName: 'fly', description: 'Sends a fake fly that looks surprisngly real.', diff --git a/commands/single/nom.js b/commands/single/nom.js deleted file mode 100644 index 0a6ef42a..00000000 --- a/commands/single/nom.js +++ /dev/null @@ -1,19 +0,0 @@ -const Command = require('../../structures/Command'); -const path = require('path'); - -module.exports = class NomCommand extends Command { - constructor(client) { - super(client, { - name: 'nom', - aliases: ['kanna-crab'], - group: 'single', - memberName: 'nom', - description: 'Posts a GIF of Kanna eating a crab.', - clientPermissions: ['ATTACH_FILES'] - }); - } - - run(msg) { - return msg.say({ files: [path.join(__dirname, '..', '..', 'assets', 'images', 'nom.gif')] }); - } -}; diff --git a/commands/single/source.js b/commands/single/source.js deleted file mode 100644 index 5727558a..00000000 --- a/commands/single/source.js +++ /dev/null @@ -1,19 +0,0 @@ -const Command = require('../../structures/Command'); -const path = require('path'); - -module.exports = class SourceCommand extends Command { - constructor(client) { - super(client, { - name: 'source', - aliases: ['sauce'], - group: 'single', - memberName: 'source', - description: 'Hello! Can you give me the source?', - clientPermissions: ['ATTACH_FILES'] - }); - } - - run(msg) { - return msg.say({ files: [path.join(__dirname, '..', '..', 'assets', 'images', 'source.png')] }); - } -}; diff --git a/commands/single/tableflip.js b/commands/single/tableflip.js index 86b9ada1..4357b375 100644 --- a/commands/single/tableflip.js +++ b/commands/single/tableflip.js @@ -12,7 +12,7 @@ module.exports = class TableflipCommand extends Command { constructor(client) { super(client, { name: 'tableflip', - aliases: ['a-tableflip', 'animated-tableflip', 'tableflip-animated', 'tableflip-a'], + aliases: ['a-tableflip', 'animated-tableflip'], group: 'single', memberName: 'tableflip', description: 'Flips a table... With animation!' diff --git a/commands/text-edit/base64.js b/commands/text-edit/base64.js index 48dc6a3b..abaade7c 100644 --- a/commands/text-edit/base64.js +++ b/commands/text-edit/base64.js @@ -6,7 +6,6 @@ module.exports = class Base64Command extends Command { constructor(client) { super(client, { name: 'base64', - aliases: ['base-64'], group: 'text-edit', memberName: 'base64', description: 'Converts text to/from Base64.', diff --git a/commands/text-edit/fancy.js b/commands/text-edit/fancy.js index cd10e333..6f1b548f 100644 --- a/commands/text-edit/fancy.js +++ b/commands/text-edit/fancy.js @@ -6,7 +6,6 @@ module.exports = class FancyCommand extends Command { constructor(client) { super(client, { name: 'fancy', - aliases: ['fancy-letters'], group: 'text-edit', memberName: 'fancy', description: 'Converts text to fancy letters.', diff --git a/commands/text-edit/md5.js b/commands/text-edit/md5.js index 631d205d..b7660445 100644 --- a/commands/text-edit/md5.js +++ b/commands/text-edit/md5.js @@ -5,7 +5,6 @@ module.exports = class MD5Command extends Command { constructor(client) { super(client, { name: 'md5', - aliases: ['md5-hash'], group: 'text-edit', memberName: 'md5', description: 'Creates a hash of text with the MD5 algorithm.', diff --git a/commands/text-edit/organization-xiii-name.js b/commands/text-edit/nobody-name.js similarity index 70% rename from commands/text-edit/organization-xiii-name.js rename to commands/text-edit/nobody-name.js index fc5e0af3..102342c6 100644 --- a/commands/text-edit/organization-xiii-name.js +++ b/commands/text-edit/nobody-name.js @@ -1,13 +1,13 @@ const Command = require('../../structures/Command'); const { shuffle, firstUpperCase } = require('../../util/Util'); -module.exports = class OrganizationXIIINameCommand extends Command { +module.exports = class NobodyNameCommand extends Command { constructor(client) { super(client, { - name: 'organization-xiii-name', - aliases: ['organization-xiii', 'org-xiii-name', 'org-xiii', 'organization-name', 'org-name', 'nobody-name'], + name: 'nobody-name', + aliases: ['organization-name', 'org-name', 'organization-xiii-name'], group: 'text-edit', - memberName: 'organization-xiii-name', + memberName: 'nobody-name', description: 'Converts a name into the Organization XIII style.', args: [ { diff --git a/commands/text-edit/owo.js b/commands/text-edit/owo.js index 3fed5c03..1a7d5c25 100644 --- a/commands/text-edit/owo.js +++ b/commands/text-edit/owo.js @@ -5,6 +5,7 @@ module.exports = class OwOCommand extends Command { constructor(client) { super(client, { name: 'owo', + aliases: ['furry-speak', 'fur-speak'], group: 'text-edit', memberName: 'owo', description: 'OwO.', diff --git a/commands/text-edit/portal-send.js b/commands/text-edit/portal-send.js index 7fd99ca9..77bf05dc 100644 --- a/commands/text-edit/portal-send.js +++ b/commands/text-edit/portal-send.js @@ -4,7 +4,7 @@ module.exports = class PortalSendCommand extends Command { constructor(client) { super(client, { name: 'portal-send', - aliases: ['send-portal-message', 'portal-message', 'send-portal-msg', 'portal-msg', 'portal'], + aliases: ['portal'], group: 'text-edit', memberName: 'portal-send', description: 'Send a message to a portal channel.', diff --git a/commands/text-edit/sha-1.js b/commands/text-edit/sha-1.js index 052f3ece..6e344ae8 100644 --- a/commands/text-edit/sha-1.js +++ b/commands/text-edit/sha-1.js @@ -5,7 +5,6 @@ module.exports = class SHA1Command extends Command { constructor(client) { super(client, { name: 'sha-1', - aliases: ['sha-1-hash'], group: 'text-edit', memberName: 'sha-1', description: 'Creates a hash of text with the SHA-1 algorithm.', diff --git a/commands/text-edit/sha-256.js b/commands/text-edit/sha-256.js index 4f243431..5ac41990 100644 --- a/commands/text-edit/sha-256.js +++ b/commands/text-edit/sha-256.js @@ -5,7 +5,6 @@ module.exports = class SHA256Command extends Command { constructor(client) { super(client, { name: 'sha-256', - aliases: ['sha-256-hash'], group: 'text-edit', memberName: 'sha-256', description: 'Creates a hash of text with the SHA-256 algorithm.', diff --git a/commands/text-edit/alphabet-reverse.js b/commands/text-edit/tebahpla.js similarity index 64% rename from commands/text-edit/alphabet-reverse.js rename to commands/text-edit/tebahpla.js index a6c5c871..fb105d1a 100644 --- a/commands/text-edit/alphabet-reverse.js +++ b/commands/text-edit/tebahpla.js @@ -1,14 +1,14 @@ const Command = require('../../structures/Command'); const { letterTrans } = require('custom-translate'); -const dictionary = require('../../assets/json/alphabet-reverse'); +const dictionary = require('../../assets/json/tebahpla'); -module.exports = class AlphabetReverseCommand extends Command { +module.exports = class TebahplaCommand extends Command { constructor(client) { super(client, { - name: 'alphabet-reverse', - aliases: ['reverse-alphabet', 'tebahpla'], + name: 'tebahpla', + aliases: ['reverse-alphabet', 'alphabet-reverse'], group: 'text-edit', - memberName: 'alphabet-reverse', + memberName: 'tebahpla', description: 'Reverses the alphabet of text.', args: [ { diff --git a/commands/text-edit/zalgo.js b/commands/text-edit/zalgo.js index 08a8c284..a6c172e9 100644 --- a/commands/text-edit/zalgo.js +++ b/commands/text-edit/zalgo.js @@ -5,7 +5,6 @@ module.exports = class ZalgoCommand extends Command { constructor(client) { super(client, { name: 'zalgo', - aliases: ['zalgolize'], group: 'text-edit', memberName: 'zalgo', description: 'Converts text to zalgo.', diff --git a/commands/util/info.js b/commands/util/info.js index 5b548095..0acc2b7a 100644 --- a/commands/util/info.js +++ b/commands/util/info.js @@ -11,7 +11,7 @@ module.exports = class InfoCommand extends Command { constructor(client) { super(client, { name: 'info', - aliases: ['information', 'stats'], + aliases: ['stats'], group: 'util', memberName: 'info', description: 'Responds with detailed bot information.', diff --git a/commands/voice/dec-talk.js b/commands/voice/dec-talk.js index 2627859d..c1914b34 100644 --- a/commands/voice/dec-talk.js +++ b/commands/voice/dec-talk.js @@ -5,7 +5,7 @@ module.exports = class DECTalkCommand extends Command { constructor(client) { super(client, { name: 'dec-talk', - aliases: ['moon-base-alpha', 'text-to-speech', 'tts'], + aliases: ['text-to-speech', 'tts'], group: 'voice', memberName: 'dec-talk', description: 'The world\'s best Text-to-Speech.', diff --git a/commands/voice/soundboard.js b/commands/voice/soundboard.js index 4fe97ce8..ec655313 100644 --- a/commands/voice/soundboard.js +++ b/commands/voice/soundboard.js @@ -7,7 +7,7 @@ module.exports = class SoundboardCommand extends Command { constructor(client) { super(client, { name: 'soundboard', - aliases: ['sound', 'foley'], + aliases: ['sound'], group: 'voice', memberName: 'soundboard', description: 'Plays a sound in your voice channel.', diff --git a/package.json b/package.json index 58620eb0..4b2107d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "97.0.2", + "version": "98.0.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { @@ -40,7 +40,6 @@ "discord.js-commando": "github:discordjs/Commando", "dotenv": "^6.1.0", "erlpack": "github:discordapp/erlpack", - "is-tuesday": "^1.0.4", "mathjs": "^5.2.3", "moment": "^2.22.2", "moment-duration-format": "^2.2.2",