Remove useless aliases, bug fixes

assets/json/discord-email-fun-fact.json

@@ -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."
-]

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]}`);

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`);
 	}
 };

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.',

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)];

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}.`);

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;

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}`);
 	}
 };

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.',

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.',

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!`);
 		}

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.',

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.',

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.',

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.',

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!`);
 		}

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!`);
 		}

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']
 		});

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.'

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.',

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.`);
 	}
 };

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.',

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.',

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.',

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.'

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,

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.',

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.'

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.',

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) {

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.',

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.',

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.',

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.'
 		});
 

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.',

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) {

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.',

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,

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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: [
 				{

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.',

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.',

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.'
 		});
 	}

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: [
 				{

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.',

commands/random/discord-email-fun-fact.js

@@ -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]}`);
-	}
-};

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.',

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.',

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.'

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.'

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: [

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.',

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: [

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: [

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.',

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: [
 				{

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.',

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: [

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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.',

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: [

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: [

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.',

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.',