From d842891618ef0a7aa1a9cdb5741313fd672889aa Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sat, 15 Apr 2017 22:48:54 +0200
Subject: [PATCH] Added support for game roles with spaces

---
 .../commands/ConnectCommand.java              |  1 -
 .../discordplugin/commands/RoleCommand.java   | 19 +++++++++++++++----
 .../commands/UserinfoCommand.java             |  2 --
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
index d54ee43..928726f 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
@@ -9,7 +9,6 @@ import com.google.common.collect.HashBiMap;
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
 import sx.blah.discord.handle.obj.IMessage;
diff --git a/src/main/java/buttondevteam/discordplugin/commands/RoleCommand.java b/src/main/java/buttondevteam/discordplugin/commands/RoleCommand.java
index b799ec7..17eb355 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/RoleCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/RoleCommand.java
@@ -55,8 +55,16 @@ public class RoleCommand extends DiscordCommandBase {
 						"You need to be a moderator to use this command.");
 				return;
 			}
+			if (argsa.length < 2) {
+				DiscordPlugin.sendMessageToChannel(message.getChannel(),
+						"Add a role to the game role list.\nUsage: " + argsa[0] + " <rolename>");
+				return;
+			}
+			String rolename = argsa[1];
+			for (int i = 2; i < argsa.length; i++)
+				rolename += " " + argsa[i];
 			final List<IRole> roles = (TBMCCoreAPI.IsTestServer() ? DiscordPlugin.devServer : DiscordPlugin.mainServer)
-					.getRolesByName(argsa[1]);
+					.getRolesByName(rolename);
 			if (roles.size() == 0) {
 				DiscordPlugin.sendMessageToChannel(message.getChannel(), "That role cannot be found on Discord.");
 				return;
@@ -76,18 +84,21 @@ public class RoleCommand extends DiscordCommandBase {
 			DiscordPlugin.sendMessageToChannel(message.getChannel(), usage + "\nUsage: " + argsa[0] + " <rolename>");
 			return null;
 		}
-		if (!DiscordPlugin.GameRoles.contains(argsa[1])) {
+		String rolename = argsa[1];
+		for (int i = 2; i < argsa.length; i++)
+			rolename += " " + argsa[i];
+		if (!DiscordPlugin.GameRoles.contains(rolename)) {
 			DiscordPlugin.sendMessageToChannel(message.getChannel(),
 					"That game role cannot be found.\nList of game roles:\n"
 							+ DiscordPlugin.GameRoles.stream().collect(Collectors.joining("\n")));
 			return null;
 		}
 		final List<IRole> roles = (TBMCCoreAPI.IsTestServer() ? DiscordPlugin.devServer : DiscordPlugin.mainServer)
-				.getRolesByName(argsa[1]);
+				.getRolesByName(rolename);
 		if (roles.size() == 0) {
 			DiscordPlugin.sendMessageToChannel(message.getChannel(),
 					"The specified role cannot be found on Discord! Removing from the list.");
-			DiscordPlugin.GameRoles.remove(argsa[1].toLowerCase());
+			DiscordPlugin.GameRoles.remove(rolename);
 			return null;
 		}
 		if (roles.size() > 1) {
diff --git a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
index f9a2327..1c7a062 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
@@ -3,8 +3,6 @@ package buttondevteam.discordplugin.commands;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCCoreAPI;