Add blush, merge some rp commands, remove others

.env.example

@@ -43,18 +43,15 @@ YANDEX_KEY=
 YODA_KEY=
 
 # Imgur album IDs
-BREAK_UP_ALBUM_ID=
+BLUSH_ALBUM_ID=
 EAT_ALBUM_ID=
-EVOLVE_ALBUM_ID=
 FIDGET_ALBUM_ID=
 FIST_BUMP_ALBUM_ID=
 HIGH_FIVE_ALBUM_ID=
-HIT_WITH_SHOVEL_ALBUM_ID=
 HOLD_HANDS_ALBUM_ID=
 HUG_ALBUM_ID=
 KILL_ALBUM_ID=
 KISS_ALBUM_ID=
-MARRY_ALBUM_ID=
 PAT_ALBUM_ID=
 POKE_ALBUM_ID=
 POSTER_ALBUM_ID=

README.md

@@ -8,14 +8,14 @@
 
 Xiao is a Discord bot coded in JavaScript with
 [discord.js](https://discord.js.org/) using the
-[Commando](https://github.com/discordjs/Commando) command framework. With over
+[Commando](https://github.com/discordjs/Commando) command framework. With nearly
 300 commands, she is one of the most feature-filled bots out there.
 
 ## Invite
 The bot is no longer available for invite. You can self-host the bot, or use her
 on the [home server](https://discord.gg/sbMe32W).
 
-## Commands (300)
+## Commands (297)
 ### Utility:
 
 * **eval**: Executes JavaScript code.
@@ -341,17 +341,14 @@ on the [home server](https://discord.gg/sbMe32W).
 
 ### Roleplay:
 
-* **break-up**: Breaks up with a user.
+* **blush**: Blushes at a user.
 * **eat**: Eats a user.
-* **evolve**: Evolves a user.
 * **fist-bump**: Fistbumps a user.
 * **high-five**: High Fives a user.
-* **hit-with-shovel**: Hits a user with a shovel.
 * **hold-hands**: Holds hands with a user.
 * **hug**: Hugs a user.
 * **kill**: Kills a user.
 * **kiss**: Kisses a user.
-* **marry**: Marries a user.
 * **pat**: Pats a user.
 * **poke**: Pokes a user.
 * **punch**: Punches a user.

commands/roleplay/blush.js

@@ -1,16 +1,15 @@
 const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { BREAK_UP_ALBUM_ID } = process.env;
+const { BLUSH_ALBUM_ID } = process.env;
 
-module.exports = class BreakUpCommand extends RoleplayCommand {
+module.exports = class BlushCommand extends RoleplayCommand {
 	constructor(client) {
 		super(client, {
-			name: 'break-up',
-			aliases: ['divorce'],
+			name: 'blush',
 			group: 'roleplay',
 			memberName: 'break-up',
-			description: 'Breaks up with a user.',
+			description: 'Blushes at a user.',
 			clientPermissions: ['ATTACH_FILES'],
-			albumID: BREAK_UP_ALBUM_ID,
+			albumID: BLUSH_ALBUM_ID,
 			args: [
 				{
 					key: 'user',
@@ -22,6 +21,6 @@ module.exports = class BreakUpCommand extends RoleplayCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${msg.author.username}** breaks up with **${user.username}**._`;
+		return `_**${msg.author.username}** blushes at **${user.username}**._`;
 	}
 };

commands/roleplay/evolve.js

@@ -1,27 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { EVOLVE_ALBUM_ID } = process.env;
-
-module.exports = class EvolveCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'evolve',
-			group: 'roleplay',
-			memberName: 'evolve',
-			description: 'Evolves a user.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: EVOLVE_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user',
-					default: msg => msg.author
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${user.username}** is evolving!_`;
-	}
-};

commands/roleplay/hit-with-shovel.js

@@ -1,26 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { HIT_WITH_SHOVEL_ALBUM_ID } = process.env;
-
-module.exports = class HitWithShovelCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'hit-with-shovel',
-			group: 'roleplay',
-			memberName: 'hit-with-shovel',
-			description: 'Hits a user with a shovel.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: HIT_WITH_SHOVEL_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user'
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${msg.author.username}** hits **${user.username}** with a shovel._`;
-	}
-};

commands/roleplay/kiss.js

@@ -5,6 +5,7 @@ module.exports = class KissCommand extends RoleplayCommand {
 	constructor(client) {
 		super(client, {
 			name: 'kiss',
+			aliases: ['marry'],
 			group: 'roleplay',
 			memberName: 'kiss',
 			description: 'Kisses a user.',

commands/roleplay/marry.js

@@ -1,26 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { MARRY_ALBUM_ID } = process.env;
-
-module.exports = class MarryCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'marry',
-			group: 'roleplay',
-			memberName: 'marry',
-			description: 'Marries a user.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: MARRY_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user'
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${msg.author.username}** marries **${user.username}**._`;
-	}
-};

commands/roleplay/slap.js

@@ -5,6 +5,7 @@ module.exports = class SlapCommand extends RoleplayCommand {
 	constructor(client) {
 		super(client, {
 			name: 'slap',
+			aliases: ['break-up', 'divorce'],
 			group: 'roleplay',
 			memberName: 'slap',
 			description: 'Slaps a user.',

package.json

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