Remove useless aliases, bug fixes

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