Bunch of new aliases

commands/analyze/character-count.js

@@ -1,5 +1,6 @@
 const Command = require('../../structures/Command');
 const { formatNumber } = require('../../util/Util');
+const { Message } = require('discord.js');
 
 module.exports = class CharacterCountCommand extends Command {
 	constructor(client) {
@@ -13,13 +14,16 @@ module.exports = class CharacterCountCommand extends Command {
 				{
 					key: 'text',
 					prompt: 'What text would you like to get the character count of?',
-					type: 'string'
+					type: 'message|string'
 				}
 			]
 		});
 	}
 
 	run(msg, { text }) {
+		if (text instanceof Message) {
+			return msg.reply(formatNumber(text.content ? text.content.length : 0));
+		}
 		return msg.reply(formatNumber(text.length));
 	}
 };

commands/analyze/chinese-zodiac.js

@@ -5,7 +5,7 @@ module.exports = class ChineseZodiacCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'chinese-zodiac',
-			aliases: ['chinese-zodiac-sign'],
+			aliases: ['chinese-zodiac-sign', 'c-zodiac', 'c-zodiac-sign'],
 			group: 'analyze',
 			memberName: 'chinese-zodiac',
 			description: 'Responds with the Chinese Zodiac Sign for the given year.',

commands/analyze/safe-url.js

@@ -7,7 +7,7 @@ module.exports = class SafeUrlCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'safe-url',
-			aliases: ['check-url', 'safe-browsing', 'virus', 'safe-link', 'check-link'],
+			aliases: ['check-url', 'safe-browsing', 'virus', 'safe-link', 'check-link', 'spoopy-link'],
 			group: 'analyze',
 			memberName: 'safe-url',
 			description: 'Determines if a URL is safe or not.',

commands/analyze/severe-toxicity.js

@@ -6,7 +6,7 @@ module.exports = class SevereToxicityCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'severe-toxicity',
-			aliases: ['severe-perspective', 'severe-comment-toxicity'],
+			aliases: ['severe-perspective', 'severe-comment-toxicity', 'severe-toxic'],
 			group: 'analyze',
 			memberName: 'severe-toxicity',
 			description: 'Determines the toxicity of text, but less sensitive to milder language.',

commands/analyze/toxicity.js

@@ -6,7 +6,7 @@ module.exports = class ToxicityCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'toxicity',
-			aliases: ['perspective', 'comment-toxicity'],
+			aliases: ['perspective', 'comment-toxicity', 'toxic'],
 			group: 'analyze',
 			memberName: 'toxicity',
 			description: 'Determines the toxicity of text.',

commands/analyze/what-anime.js

@@ -8,7 +8,7 @@ module.exports = class WhatAnimeCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'what-anime',
-			aliases: ['anime-source', 'anime-src', 'trace-moe', 'source', 'src'],
+			aliases: ['anime-source', 'anime-src', 'trace-moe'],
 			group: 'analyze',
 			memberName: 'what-anime',
 			description: 'Determines what anime a screenshot is from.',

commands/code/lint-rule.js

@@ -8,7 +8,7 @@ module.exports = class LintRuleCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'lint-rule',
-			aliases: ['eslint-rule'],
+			aliases: ['eslint-rule', 'linter-rule'],
 			group: 'code',
 			memberName: 'lint-rule',
 			description: 'Responds with information on an ESLint rule.',

commands/code/lint.js

@@ -9,7 +9,7 @@ module.exports = class LintCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'lint',
-			aliases: ['eslint'],
+			aliases: ['eslint', 'linter'],
 			group: 'code',
 			memberName: 'lint',
 			description: 'Lints code using ESLint.',

commands/edit-avatar/fire.js

@@ -11,7 +11,7 @@ module.exports = class FireCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'fire',
-			aliases: ['hell', 'burn'],
+			aliases: ['hell', 'burn', 'flames'],
 			group: 'edit-avatar',
 			memberName: 'fire',
 			description: 'Burns a user\'s avatar.',

commands/edit-avatar/rip.js

@@ -9,7 +9,7 @@ module.exports = class RipCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'rip',
-			aliases: ['grave', 'grave-stone'],
+			aliases: ['grave', 'grave-stone', 'rest-in-peace'],
 			group: 'edit-avatar',
 			memberName: 'rip',
 			description: 'Draws a user\'s avatar over a gravestone.',

commands/edit-avatar/sip.js

@@ -7,7 +7,7 @@ module.exports = class SipCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'sip',
-			aliases: ['tea'],
+			aliases: ['tea', 'sip-tea'],
 			group: 'edit-avatar',
 			memberName: 'sip',
 			description: 'Draws a user\'s avatar sipping tea.',

commands/edit-avatar/steam-now-playing-classic.js

@@ -11,7 +11,7 @@ module.exports = class SteamNowPlayingClassicCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'steam-now-playing-classic',
-			aliases: ['now-playing-classic'],
+			aliases: ['now-playing-classic', 'steam-now-playing-c', 'now-playing-c'],
 			group: 'edit-avatar',
 			memberName: 'steam-now-playing-classic',
 			description: 'Draws a user\'s avatar over a Steam "now playing" notification (old skin).',

commands/edit-image/achievement.js

@@ -8,7 +8,7 @@ module.exports = class AchievementCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'achievement',
-			aliases: ['minecraft-achievement'],
+			aliases: ['minecraft-achievement', 'achieve'],
 			group: 'edit-image',
 			memberName: 'achievement',
 			description: 'Sends a Minecraft achievement with the text of your choice.',

commands/edit-image/circle.js

@@ -6,7 +6,7 @@ module.exports = class CircleCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'circle',
-			aliases: ['preview-avatar', 'preview-ava'],
+			aliases: ['preview-avatar', 'preview-ava', 'preview-pfp'],
 			group: 'edit-image',
 			memberName: 'circle',
 			description: 'Draws an image or a user\'s avatar as a circle.',

commands/edit-image/fire-frame.js

@@ -8,7 +8,7 @@ module.exports = class FireFrameCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'fire-frame',
-			aliases: ['hell-frame', 'burn-frame'],
+			aliases: ['hell-frame', 'burn-frame', 'flames-frame'],
 			group: 'edit-image',
 			memberName: 'fire-frame',
 			description: 'Draws a fiery border over an image or a user\'s avatar.',

commands/edit-image/minecraft-skin.js

@@ -7,6 +7,7 @@ module.exports = class MinecraftSkinCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'minecraft-skin',
+			aliases: ['mc-skin'],
 			group: 'edit-image',
 			memberName: 'minecraft-skin',
 			description: 'Sends the Minecraft skin for a user.',

commands/edit-meme/change-my-mind.js

@@ -10,7 +10,7 @@ module.exports = class ChangeMyMindCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'change-my-mind',
-			aliases: ['change-mind', 'mind-change'],
+			aliases: ['change-mind', 'mind-change', 'cmv', 'cmm'],
 			group: 'edit-meme',
 			memberName: 'change-my-mind',
 			description: 'Sends a "Change My Mind" meme with the text of your choice.',

commands/edit-meme/distracted-boyfriend.js

@@ -7,7 +7,7 @@ module.exports = class DistractedBoyfriendCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'distracted-boyfriend',
-			aliases: ['man-looking-at-other-woman', 'jealous-girlfriend'],
+			aliases: ['man-looking-at-other-woman', 'jealous-girlfriend', 'distracted-bf', 'jealous-gf'],
 			group: 'edit-meme',
 			memberName: 'distracted-boyfriend',
 			description: 'Draws three user\'s avatars over the "Distracted Boyfriend" meme.',

commands/edit-meme/enslaved.js

@@ -11,7 +11,7 @@ module.exports = class EnslavedCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'enslaved',
-			aliases: ['ah-yes-enslaved', 'ah-yes'],
+			aliases: ['ah-yes-enslaved', 'ah-yes', 'enslave'],
 			group: 'edit-meme',
 			memberName: 'enslaved',
 			description: 'Sends a "Ah yes, enslaved" meme with the image and text of your choice.',

commands/edit-meme/meme-gen-modern.js

@@ -25,7 +25,8 @@ module.exports = class MemeGenModernCommand extends Command {
 				'm-meme-generator',
 				'create-m-meme',
 				'mgm',
-				'mg'
+				'mg',
+				'reaction-meme'
 			],
 			group: 'edit-meme',
 			memberName: 'meme-gen-modern',

commands/edit-meme/sora-selfie.js

@@ -7,6 +7,7 @@ module.exports = class SoraSelfieCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'sora-selfie',
+			aliases: ['sora', 'sora-camera', 'sora-cam'],
 			group: 'edit-meme',
 			memberName: 'sora-selfie',
 			description: 'Draws an image or a user\'s avatar behind Sora taking a selfie.',

commands/edit-meme/this-guy.js

@@ -8,7 +8,7 @@ module.exports = class ThisGuyCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'this-guy',
-			aliases: ['get-a-load-of-this-guy'],
+			aliases: ['get-a-load-of-this-guy', 'get-a-load-of'],
 			group: 'edit-meme',
 			memberName: 'this-guy',
 			description: 'Draws an image or a user\'s avatar over the "Get a load of this guy" meme.',

commands/edit-meme/thug-life.js

@@ -8,6 +8,7 @@ module.exports = class ThugLifeCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'thug-life',
+			aliases: ['thug'],
 			group: 'edit-meme',
 			memberName: 'thug-life',
 			description: 'Draws "Thug Life" over an image or a user\'s avatar.',

commands/edit-meme/to-be-continued.js

@@ -8,6 +8,7 @@ module.exports = class ToBeContinuedCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'to-be-continued',
+			aliases: ['tbc', 'つづく', 'tsudzuku', 'tsuzuku'],
 			group: 'edit-meme',
 			memberName: 'to-be-continued',
 			description: 'Draws an image with the "To Be Continued..." arrow.',

commands/edit-meme/vietnam-flashbacks.js

@@ -7,7 +7,7 @@ module.exports = class VietnamFlashbacksCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'vietnam-flashbacks',
-			aliases: ['nam-flashbacks', 'vietnam'],
+			aliases: ['nam-flashbacks', 'vietnam', 'nam'],
 			group: 'edit-meme',
 			memberName: 'vietnam-flashbacks',
 			description: 'Edits Vietnam flashbacks behind an image or a user\'s avatar.',

commands/edit-number/currency.js

@@ -6,6 +6,7 @@ module.exports = class CurrencyCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'currency',
+			aliases: ['money-convert', 'convert-money'],
 			group: 'edit-number',
 			memberName: 'currency',
 			description: 'Converts currency from one currency to another.',

commands/edit-text/brony-speak.js

@@ -6,7 +6,7 @@ module.exports = class BronySpeakCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'brony-speak',
-			aliases: ['pony-speak'],
+			aliases: ['pony-speak', 'my-little-pony-speak', 'mlp-speak'],
 			group: 'edit-text',
 			memberName: 'brony-speak',
 			description: 'Converts text to brony speak.',

commands/edit-text/cow-say.js

@@ -5,6 +5,7 @@ module.exports = class CowSayCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'cow-say',
+			aliases: ['cow'],
 			group: 'edit-text',
 			memberName: 'cow-say',
 			description: 'Makes a cow say your text.',

commands/edit-text/emojify.js

@@ -6,7 +6,7 @@ module.exports = class EmojifyCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'emojify',
-			aliases: ['regional-indicator'],
+			aliases: ['regional-indicator', 'big-text'],
 			group: 'edit-text',
 			memberName: 'emojify',
 			description: 'Converts text to emoji form.',

commands/edit-text/nobody-name.js

@@ -6,7 +6,14 @@ module.exports = class NobodyNameCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'nobody-name',
-			aliases: ['organization-name', 'org-name', 'organization-xiii-name'],
+			aliases: [
+				'organization-name',
+				'org-name',
+				'organization-xiii-name',
+				'organization-13-name',
+				'org-13-name',
+				'org-xiii-name'
+			],
 			group: 'edit-text',
 			memberName: 'nobody-name',
 			description: 'Converts a name into the Organization XIII style.',

commands/games-mp/balloon-pop.js

@@ -6,6 +6,7 @@ module.exports = class BalloonPopCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'balloon-pop',
+			aliases: ['balloons'],
 			group: 'games-mp',
 			memberName: 'balloon-pop',
 			description: 'Don\'t let yourself be the last one to pump the balloon before it pops!',

commands/games-mp/battle.js

@@ -6,7 +6,7 @@ module.exports = class BattleCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'battle',
-			aliases: ['fight', 'death-battle'],
+			aliases: ['fight', 'death-battle', 'rpg-battle'],
 			group: 'games-mp',
 			memberName: 'battle',
 			description: 'Engage in a turn-based battle against another user or the AI.',

commands/games-mp/car-race.js

@@ -12,7 +12,7 @@ module.exports = class CarRaceCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'car-race',
-			aliases: ['cars'],
+			aliases: ['cars', 'race'],
 			group: 'games-mp',
 			memberName: 'car-race',
 			description: 'Race a car against another user.',
@@ -294,9 +294,9 @@ module.exports = class CarRaceCommand extends Command {
 		const canvas = createCanvas(bg.width, bg.height);
 		const ctx = canvas.getContext('2d');
 		ctx.drawImage(bg, 0, 0);
-		const oppoCarX = -155 + (92 * oppoCarSpaces);
+		const oppoCarX = -155 + (77 * oppoCarSpaces);
 		ctx.drawImage(oppoCar, oppoCarX, 208);
-		const userCarX = -155 + (92 * userCarSpaces);
+		const userCarX = -155 + (77 * userCarSpaces);
 		ctx.drawImage(userCar, userCarX, 254);
 		if (win) {
 			const fireworks = await loadImage(

commands/games-sp/fishy.js

@@ -6,7 +6,7 @@ module.exports = class FishyCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'fishy',
-			aliases: ['fishing'],
+			aliases: ['fishing', 'fish'],
 			group: 'games-sp',
 			memberName: 'fishy',
 			description: 'Go fishing.',

commands/info/message-source.js

@@ -5,7 +5,7 @@ module.exports = class MessageSourceCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'message-source',
-			aliases: ['msg-source', 'message-src', 'msg-src'],
+			aliases: ['msg-source', 'message-src', 'msg-src', 'source', 'src'],
 			group: 'info',
 			memberName: 'message-source',
 			description: 'Responds with a codeblock containing a message\'s contents.',

commands/info/message.js

@@ -5,7 +5,7 @@ module.exports = class MessageCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'message',
-			aliases: ['message-info', 'msg', 'msg-info', 'reply'],
+			aliases: ['message-info', 'msg', 'msg-info'],
 			group: 'info',
 			memberName: 'message',
 			description: 'Responds with detailed information on a message.',

commands/other/prune.js

@@ -4,7 +4,7 @@ module.exports = class PruneCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'prune',
-			aliases: ['clear'],
+			aliases: ['clear', 'bulk-delete'],
 			group: 'other',
 			memberName: 'prune',
 			description: 'Deletes up to 99 messages from the current channel.',

commands/random-img/ai-horse.js

@@ -5,7 +5,7 @@ module.exports = class AiHorseCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'ai-horse',
-			aliases: ['this-horse-does-not-exist'],
+			aliases: ['this-horse-does-not-exist', 'horse'],
 			group: 'random-img',
 			memberName: 'ai-horse',
 			description: 'Responds with a randomly generated horse.',

commands/random-img/duck.js

@@ -5,7 +5,7 @@ module.exports = class DuckCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'duck',
-			aliases: ['ducky'],
+			aliases: ['ducky', 'quack'],
 			group: 'random-img',
 			memberName: 'duck',
 			description: 'Responds with a random duck image.',

commands/roleplay/wink.js

@@ -5,6 +5,7 @@ module.exports = class WinkCommand extends ImgurAlbumCommand {
 	constructor(client) {
 		super(client, {
 			name: 'wink',
+			aliases: ['flirt'],
 			group: 'roleplay',
 			memberName: 'wink',
 			description: 'Winks at a user.',

commands/search/bulbapedia.js

@@ -7,6 +7,7 @@ module.exports = class BulbapediaCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'bulbapedia',
+			aliases: ['bulba'],
 			group: 'search',
 			memberName: 'bulbapedia',
 			description: 'Searches Bulbapedia for your query.',

commands/search/danbooru.js

@@ -5,6 +5,7 @@ module.exports = class DanbooruCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'danbooru',
+			aliases: ['booru'],
 			group: 'search',
 			memberName: 'danbooru',
 			description: 'Responds with an image from Danbooru, with optional query.',

commands/search/derpibooru.js

@@ -5,6 +5,7 @@ module.exports = class DerpibooruCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'derpibooru',
+			aliases: ['derpi'],
 			group: 'search',
 			memberName: 'derpibooru',
 			description: 'Responds with an image from Derpibooru.',

commands/search/github.js

@@ -9,7 +9,7 @@ module.exports = class GithubCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'github',
-			aliases: ['repo', 'gh'],
+			aliases: ['repo', 'gh', 'github-repo', 'gh-repo'],
 			group: 'search',
 			memberName: 'github',
 			description: 'Responds with information on a GitHub repository.',

commands/single/idiot.js

@@ -5,7 +5,7 @@ module.exports = class IdiotCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'idiot',
-			aliases: ['moron'],
+			aliases: ['moron', 'dumbass'],
 			group: 'single',
 			memberName: 'idiot',
 			description: 'Responds with the Wikipedia page of an idiot.',

commands/util-public/leave.js

@@ -9,14 +9,16 @@ module.exports = class LeaveCommand extends Command {
 			memberName: 'leave',
 			description: 'Leaves the current voice channel.',
 			guildOnly: true,
-			guarded: true,
-			userPermissions: ['MOVE_MEMBERS']
+			guarded: true
 		});
 	}
 
 	run(msg) {
 		const connection = this.client.voice.connections.get(msg.guild.id);
 		if (!connection) return msg.reply('I am not in a voice channel.');
+		if (!msg.channel.permissionsFor(msg.author).has('MOVE_MEMBERS') && connection.channel.members.size > 2) {
+			return msg.reply('You need the "Move members" permission to remove me from this voice channel.');
+		}
 		connection.channel.leave();
 		return msg.reply(`Left **${connection.channel.name}**...`);
 	}

commands/util/dependency-update.js

@@ -8,7 +8,7 @@ module.exports = class DependencyUpdateCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'dependency-update',
-			aliases: ['dep-update', 'dependencies-update', 'npm-update'],
+			aliases: ['dep-update', 'dependencies-update', 'npm-update', 'deps'],
 			group: 'util',
 			memberName: 'dependency-update',
 			description: 'Checks for dependency updates.',

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "127.2.1",
+	"version": "128.0.0",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {