From f484aba3611cbd4d7e83e4f1549998d7d2768fde Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Fri, 2 Dec 2016 22:59:37 +0100
Subject: [PATCH] (#12) Online players can now use their cmds

Assuming it works.
---
 .../listeners/MCChatListener.java             | 30 +++++++++++++++----
 .../mccommands/AcceptMCCommand.java           |  2 ++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 8e55cc8..79ba7e1 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -1,20 +1,26 @@
 package buttondevteam.discordplugin.listeners;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.discordplugin.DiscordSender;
 import buttondevteam.lib.TBMCChatEvent;
 import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.TBMCPlayer;
 import buttondevteam.lib.chat.Channel;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import sx.blah.discord.api.events.IListener;
 import sx.blah.discord.handle.impl.events.MessageReceivedEvent;
+import sx.blah.discord.handle.obj.IUser;
 
 public class MCChatListener implements Listener, IListener<MessageReceivedEvent> {
 	@EventHandler // Minecraft
@@ -26,23 +32,37 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 					"<" + e.getSender().getName() + "> " + e.getMessage());
 	}
 
-	private final String[] UnconnectedCmds = new String[] { "list", "u", "shrug", "tableflip", "unflip" };
+	private static final String[] UnconnectedCmds = new String[] { "list", "u", "shrug", "tableflip", "unflip" };
+
+	public static final HashMap<String, DiscordSender> UnconnectedSenders = new HashMap<>();
 
 	@Override // Discord
 	public void handle(MessageReceivedEvent event) {
-		if (event.getMessage().getAuthor().isBot())
+		final IUser author = event.getMessage().getAuthor();
+		if (author.isBot())
 			return;
 		if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID())
 		/* && !(event.getMessage().getChannel().isPrivate() && privatechat) */)
 			return;
-		final DiscordSender dsender = new DiscordSender(event.getMessage().getAuthor());
+		if (!UnconnectedSenders.containsKey(author.getID()))
+			UnconnectedSenders.put(author.getID(), new DiscordSender(author));
+		final DiscordSender dsender = UnconnectedSenders.get(author.getID());
 		dsender.setChannel(event.getMessage().getChannel());
 		if (event.getMessage().getContent().startsWith("/")) {
 			final String cmd = event.getMessage().getContent().substring(1);
+			Stream<? extends Player> str = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players
+				try (DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class)) {
+					return author.getID().equals(dp.getDiscordID());
+				} catch (Exception e) {
+					TBMCCoreAPI.SendException("An error occured while getting Discord player for chat", e);
+					return false;
+				}
+			});
 			try {
-				if (false) // Connected?
-				{ // TODO
+				if (str.count() > 0) // Connected?
+				{
 					// Execute as ingame player
+					Bukkit.dispatchCommand(str.findAny().get(), cmd);
 				} else {
 					if (!Arrays.stream(UnconnectedCmds).anyMatch(s -> cmd.startsWith(s))) {
 						// Command not whitelisted
diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
index 13aa36e..10cfdae 100644
--- a/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java
@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.discordplugin.listeners.MCChatListener;
 import buttondevteam.lib.TBMCPlayer;
 
 public class AcceptMCCommand extends DiscordMCCommandBase {
@@ -43,6 +44,7 @@ public class AcceptMCCommand extends DiscordMCCommandBase {
 		}
 		TBMCPlayer.getPlayerAs((Player) sender, DiscordPlayer.class).setDiscordID(did);
 		ConnectCommand.WaitingToConnect.remove(sender.getName());
+		MCChatListener.UnconnectedSenders.remove(did);
 		sender.sendMessage("§bAccounts connected.");
 		return true;
 	}