From 143bc59ca095c5e5494a789f314d8b5a4690adf4 Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra.lan>
Date: Sun, 18 Dec 2016 23:12:39 -0700
Subject: [PATCH] Add disccord-[CHANNEL]-chat message type.

---
 .../purpleirc/GameListeners/DiscordListener.java    |  7 ++++++-
 src/main/java/com/cnaude/purpleirc/PurpleBot.java   | 13 +++++++++----
 src/main/resources/SampleBot.yml                    |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/DiscordListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/DiscordListener.java
index 7be2115..4668fce 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/DiscordListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/DiscordListener.java
@@ -18,9 +18,13 @@ package com.cnaude.purpleirc.GameListeners;
 
 import com.cnaude.purpleirc.PurpleBot;
 import com.cnaude.purpleirc.PurpleIRC;
+import com.scarsz.discordsrv.DiscordSRV;
 import com.scarsz.discordsrv.api.DiscordSRVListener;
+import com.scarsz.discordsrv.jda.entities.TextChannel;
 import com.scarsz.discordsrv.jda.events.Event;
 import com.scarsz.discordsrv.jda.events.message.guild.GuildMessageReceivedEvent;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -41,10 +45,11 @@ public class DiscordListener extends DiscordSRVListener {
     @Override
     public void onRawDiscordEventReceived(Event event) {
         if (event instanceof GuildMessageReceivedEvent) {
+            
             GuildMessageReceivedEvent guildMessageEvent = (GuildMessageReceivedEvent) event;
             for (PurpleBot ircBot : plugin.ircBots.values()) {
                 ircBot.discordChat(guildMessageEvent.getMessage().getAuthor().getUsername(),
-                        guildMessageEvent.getMessage().getChannelId(),
+                        guildMessageEvent.getChannel().getName(),
                         guildMessageEvent.getMessage().getContent());
             }
         }
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index 14cbc48..910ce4d 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -1553,19 +1553,20 @@ public final class PurpleBot {
      * Called from Discord ProcessChatEvent
      *
      * @param username
-     * @param channelId
+     * @param discordChannel
      * @param message
      */
-    public void discordChat(String username, String channelId, String message) {
+    public void discordChat(String username, String discordChannel, String message) {
         if (!this.isConnected()) {
             return;
         }
         for (String channelName : botChannels) {
-            if (isMessageEnabled(channelName, TemplateName.DISCORD_CHAT)) {
+            if (isMessageEnabled(channelName, TemplateName.DISCORD_CHAT)
+                    || isMessageEnabled(channelName, "discord-" + discordChannel + "-chat")) {
                 asyncIRCMessage(channelName, plugin.tokenizer
                         .gameChatToIRCTokenizer(username, plugin.getMessageTemplate(
                                 botNick, channelName, TemplateName.DISCORD_CHAT), message)
-                        .replace("%CHANNEL%", channelId)
+                        .replace("%CHANNEL%", discordChannel)
                 );
             }
         }
@@ -1723,7 +1724,11 @@ public final class PurpleBot {
     /**
      *
      * @param player
+     * @param blockName
+     * @param oreName
      * @param vein
+     * @param oreColor
+     * @param loc
      */
     public void gameOreBroadcast(Player player, String blockName, String oreName, ChatColor oreColor, Set<Block> vein, Location loc) {
         if (!this.isConnected()) {
diff --git a/src/main/resources/SampleBot.yml b/src/main/resources/SampleBot.yml
index e8f866f..f4a80a7 100644
--- a/src/main/resources/SampleBot.yml
+++ b/src/main/resources/SampleBot.yml
@@ -277,6 +277,7 @@ channels:
     - stm-comment
     # Messages from Discord
     - discord-chat
+    #- discord-[CHANNEL]-chat
     # Messages from IRC to discord
     - irc-discord-chat
     # Catch /broadcast messages