From 276ab40760b031da15e08b13e9d67cbe67ceacbe Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Mon, 28 Nov 2016 18:42:41 +0100
Subject: [PATCH] Added partial support for private channels and fixed response
 location

---
 .../discordplugin/DiscordSender.java             | 16 +++++++++++++---
 .../discordplugin/listeners/MCChatListener.java  |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSender.java b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
index 7a6ddc4..5cc3dc9 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordSender.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSender.java
@@ -12,16 +12,26 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
 
 import buttondevteam.lib.TBMCCoreAPI;
+import sx.blah.discord.handle.obj.IChannel;
 import sx.blah.discord.handle.obj.IUser;
 
 public class DiscordSender implements CommandSender {
 	private PermissibleBase perm = new PermissibleBase(this);
 	private IUser user;
+	private IChannel channel;
 
 	public DiscordSender(IUser user) {
 		this.user = user;
 	}
 
+	public IChannel getChannel() {
+		return channel;
+	}
+
+	public void setChannel(IChannel channel) {
+		this.channel = channel;
+	}
+
 	@Override
 	public boolean isPermissionSet(String name) {
 		return perm.isPermissionSet(name);
@@ -78,18 +88,18 @@ public class DiscordSender implements CommandSender {
 	}
 
 	@Override
-	public boolean isOp() { //TODO: Connect with TBMC acc
+	public boolean isOp() { // TODO: Connect with TBMC acc
 		return false;
 	}
 
 	@Override
-	public void setOp(boolean value) { //TODO: Connect with TBMC acc
+	public void setOp(boolean value) { // TODO: Connect with TBMC acc
 	}
 
 	@Override
 	public void sendMessage(String message) {
 		try {
-			DiscordPlugin.sendMessageToChannel(user.getOrCreatePMChannel(), message);
+			DiscordPlugin.sendMessageToChannel(channel, message);
 		} catch (Exception e) {
 			TBMCCoreAPI.SendException("An error occured while sending message to DiscordSender", e);
 		}
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 0d2224c..31dea05 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -27,9 +27,11 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 	public void handle(MessageReceivedEvent event) {
 		if (event.getMessage().getAuthor().isBot())
 			return;
-		if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID()))
+		if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID())
+		/* && !(event.getMessage().getChannel().isPrivate() && privatechat) */)
 			return;
 		final DiscordSender dsender = new DiscordSender(event.getMessage().getAuthor());
+		dsender.setChannel(event.getMessage().getChannel());
 		if (event.getMessage().getContent().startsWith("/")) {
 			final String cmd = event.getMessage().getContent().substring(1);
 			try {