From 8c6404cf996f9818b07f1b5c304e993ddd5b9867 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Wed, 20 May 2020 11:38:01 -0400
Subject: [PATCH] Improve roleplay commands

---
 commands/roleplay/blush.js     | 3 ++-
 commands/roleplay/celebrate.js | 3 ++-
 commands/roleplay/eat.js       | 3 ++-
 commands/roleplay/sleep.js     | 3 ++-
 commands/roleplay/wake-up.js   | 3 ++-
 commands/roleplay/wave.js      | 3 ++-
 commands/roleplay/wink.js      | 3 ++-
 package.json                   | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/commands/roleplay/blush.js b/commands/roleplay/blush.js
index 6d0d1037..784c340b 100644
--- a/commands/roleplay/blush.js
+++ b/commands/roleplay/blush.js
@@ -21,6 +21,7 @@ module.exports = class BlushCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${msg.author.username}** blushes at **${user.username}**._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** blushes${noUserAuthor ? ` at **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/celebrate.js b/commands/roleplay/celebrate.js
index 78c83c2f..316458e6 100644
--- a/commands/roleplay/celebrate.js
+++ b/commands/roleplay/celebrate.js
@@ -23,6 +23,7 @@ module.exports = class CelebrateCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${user.username}** celebrates._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** celebrates${noUserAuthor ? ` with **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js
index b02febe4..9600510b 100644
--- a/commands/roleplay/eat.js
+++ b/commands/roleplay/eat.js
@@ -22,6 +22,7 @@ module.exports = class EatCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${user.username}** eats._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** eats${noUserAuthor ? ` with **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/sleep.js b/commands/roleplay/sleep.js
index b8b2d2c7..39f000e5 100644
--- a/commands/roleplay/sleep.js
+++ b/commands/roleplay/sleep.js
@@ -23,6 +23,7 @@ module.exports = class SleepCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${user.username}** falls asleep._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** falls asleep${noUserAuthor ? ` with **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/wake-up.js b/commands/roleplay/wake-up.js
index f37acbf4..49ea998f 100644
--- a/commands/roleplay/wake-up.js
+++ b/commands/roleplay/wake-up.js
@@ -23,6 +23,7 @@ module.exports = class WakeUpCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${user.username}** wakes up._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** wakes up${noUserAuthor ? ` **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/wave.js b/commands/roleplay/wave.js
index 97101099..94d50e4e 100644
--- a/commands/roleplay/wave.js
+++ b/commands/roleplay/wave.js
@@ -21,6 +21,7 @@ module.exports = class WaveCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${msg.author.username}** waves at **${user.username}**._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** waves${noUserAuthor ? ` at **${user.username}**` : ''}._`;
 	}
 };
diff --git a/commands/roleplay/wink.js b/commands/roleplay/wink.js
index 4165fe63..b87bdc91 100644
--- a/commands/roleplay/wink.js
+++ b/commands/roleplay/wink.js
@@ -21,6 +21,7 @@ module.exports = class WinkCommand extends ImgurAlbumCommand {
 	}
 
 	generateText(msg, user) {
-		return `_**${msg.author.username}** winks at **${user.username}**._`;
+		const noUserAuthor = msg.author.id !== user.id;
+		return `_**${msg.author.username}** winks${noUserAuthor ? ` at **${user.username}**` : ''}._`;
 	}
 };
diff --git a/package.json b/package.json
index 28a5f7c5..489ad1ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "114.17.0",
+	"version": "114.17.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {