Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2025-02-09 08:01:38 +01:00
Code Issues Projects Releases Wiki Activity

Add %NICK% to irc-chat-response

Browse Source
This commit is contained in:
cnaude 2016-11-19 17:33:35 -07:00
parent 9364b3847f
commit 40f98e031e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -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);

4
src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
View File

@ -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))