From 40f98e031e34a71350c49b47e4245c3a53b4f0f3 Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra.lan>
Date: Sat, 19 Nov 2016 17:33:35 -0700
Subject: [PATCH] Add %NICK% to irc-chat-response

---
 src/main/java/com/cnaude/purpleirc/PurpleBot.java      | 10 +++++-----
 .../com/cnaude/purpleirc/Utilities/ChatTokenizer.java  |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index a494605..3094905 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -2938,13 +2938,13 @@ public final class PurpleBot {
             if (!responseTemplate.isEmpty()) {
                 switch (responseType) {
                     case CTCP:
-                        asyncCTCPMessage(target, plugin.tokenizer.targetChatResponseTokenizer(target, message, responseTemplate));
+                        asyncCTCPMessage(target, plugin.tokenizer.targetChatResponseTokenizer(user.getNick(), target, message, responseTemplate));
                         break;
                     case MESSAGE:
-                        asyncIRCMessage(target, plugin.tokenizer.targetChatResponseTokenizer(target, message, responseTemplate));
+                        asyncIRCMessage(target, plugin.tokenizer.targetChatResponseTokenizer(user.getNick(), target, message, responseTemplate));
                         break;
                     case NOTICE:
-                        asyncNoticeMessage(target, plugin.tokenizer.targetChatResponseTokenizer(target, message, responseTemplate));
+                        asyncNoticeMessage(target, plugin.tokenizer.targetChatResponseTokenizer(user.getNick(), target, message, responseTemplate));
                         break;
                 }
             }
@@ -2989,7 +2989,7 @@ public final class PurpleBot {
                     String responseTemplate = plugin.getMessageTemplate(botNick, channelName, TemplateName.IRC_HCHAT_RESPONSE);
                     if (!responseTemplate.isEmpty()) {
                         asyncIRCMessage(target, plugin.tokenizer
-                                .targetChatResponseTokenizer(hChannel, msg, responseTemplate));
+                                .targetChatResponseTokenizer(user.getNick(), hChannel, msg, responseTemplate));
                     }
                 } else {
                     asyncIRCMessage(target, "Hero channel \"" + hChannel + "\" does not exist!");
@@ -3054,7 +3054,7 @@ public final class PurpleBot {
                                 botNick, channelName, TemplateName.IRC_PCHAT_RESPONSE);
                         if (!responseTemplate.isEmpty()) {
                             asyncIRCMessage(target, plugin.tokenizer
-                                    .targetChatResponseTokenizer(pName, msg, responseTemplate));
+                                    .targetChatResponseTokenizer(user.getNick(), pName, msg, responseTemplate));
                         }
                         plugin.logDebug("Tokenized message: " + t);
                         player.sendMessage(t);
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
index 7cdad43..ffa2150 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -1058,13 +1058,15 @@ public class ChatTokenizer {
 
     /**
      *
+     * @param nick
      * @param target
      * @param message
      * @param template
      * @return
      */
-    public String targetChatResponseTokenizer(String target, String message, String template) {
+    public String targetChatResponseTokenizer(String nick, String target, String message, String template) {
         return plugin.colorConverter.gameColorsToIrc(template
+                .replace("%NICK%", nick)
                 .replace("%TARGET%", target)
                 .replace("%MESSAGE%", message)
                 .replace("%RAWMESSAGE%", ChatColor.stripColor(message))