From 01da85ff86f80d42a0354db809e3a9bb58eff15d Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Mon, 3 Sep 2018 15:32:36 -0400
Subject: [PATCH] Merge hug, cuddle, and tackle

---
 .env.example                |  2 --
 README.md                   |  4 +---
 commands/roleplay/cuddle.js | 26 --------------------------
 commands/roleplay/hug.js    |  1 +
 commands/roleplay/tackle.js | 27 ---------------------------
 package.json                |  2 +-
 6 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 commands/roleplay/cuddle.js
 delete mode 100644 commands/roleplay/tackle.js

diff --git a/.env.example b/.env.example
index ec60e816..70b4ec7a 100644
--- a/.env.example
+++ b/.env.example
@@ -44,7 +44,6 @@ YODA_KEY=
 
 # Imgur album IDs
 BREAK_UP_ALBUM_ID=
-CUDDLE_ALBUM_ID=
 EAT_ALBUM_ID=
 EVOLVE_ALBUM_ID=
 FIDGET_ALBUM_ID=
@@ -62,7 +61,6 @@ POSTER_ALBUM_ID=
 PUNCH_ALBUM_ID=
 SLAP_ALBUM_ID=
 SLEEP_ALBUM_ID=
-TACKLE_ALBUM_ID=
 WAKE_UP_ALBUM_ID=
 WAVE_ALBUM_ID=
 WINK_ALBUM_ID=
diff --git a/README.md b/README.md
index 44481f60..7f6e1e5d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Xiao is a Discord bot coded in JavaScript with
 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 (302)
+## Commands (300)
 ### Utility:
 
 * **eval**: Executes JavaScript code.
@@ -342,7 +342,6 @@ on the [home server](https://discord.gg/sbMe32W).
 ### Roleplay:
 
 * **break-up**: Breaks up with a user.
-* **cuddle**: Cuddles a user.
 * **eat**: Eats a user.
 * **evolve**: Evolves a user.
 * **fist-bump**: Fistbumps a user.
@@ -358,7 +357,6 @@ on the [home server](https://discord.gg/sbMe32W).
 * **punch**: Punches a user.
 * **slap**: Slaps a user.
 * **sleep**: Puts a user to sleep.
-* **tackle**: Tackles a user.
 * **wake-up**: Wakes up a user.
 * **wave**: Waves at a user.
 * **wink**: Winks at a user.
diff --git a/commands/roleplay/cuddle.js b/commands/roleplay/cuddle.js
deleted file mode 100644
index e946ba36..00000000
--- a/commands/roleplay/cuddle.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { CUDDLE_ALBUM_ID } = process.env;
-
-module.exports = class CuddleCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'cuddle',
-			group: 'roleplay',
-			memberName: 'cuddle',
-			description: 'Cuddles a user.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: CUDDLE_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user'
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${msg.author.username}** cuddles with **${user.username}**._`;
-	}
-};
diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js
index 9315a7c0..1b89ad6f 100644
--- a/commands/roleplay/hug.js
+++ b/commands/roleplay/hug.js
@@ -5,6 +5,7 @@ module.exports = class HugCommand extends RoleplayCommand {
 	constructor(client) {
 		super(client, {
 			name: 'hug',
+			aliases: ['cuddle', 'glomp', 'tackle', 'tackle-hug'],
 			group: 'roleplay',
 			memberName: 'hug',
 			description: 'Hugs a user.',
diff --git a/commands/roleplay/tackle.js b/commands/roleplay/tackle.js
deleted file mode 100644
index 37b9d8ed..00000000
--- a/commands/roleplay/tackle.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { TACKLE_ALBUM_ID } = process.env;
-
-module.exports = class TackleCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'tackle',
-			aliases: ['glomp', 'tackle-hug'],
-			group: 'roleplay',
-			memberName: 'tackle',
-			description: 'Tackles a user.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: TACKLE_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user'
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${msg.author.username}** tackles **${user.username}**._`;
-	}
-};
diff --git a/package.json b/package.json
index bb699d68..28b4fa22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "89.0.2",
+	"version": "89.0.3",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {