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

Fix VentureChat message templates.

Browse Source
This commit is contained in:
cnaude 2016-07-31 12:17:59 -07:00
parent aeeeb18d2b
commit 52ff2d4620
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cnaude/purpleirc/GameListeners/VentureChatListener.java
View File

@ -84,7 +84,7 @@ public class VentureChatListener implements Listener {
String channelTemplateName = "venture-" + vcChannel + "-chat";
if (bot.isMessageEnabled(channelName, channelTemplateName)
|| bot.isMessageEnabled(channelName, TemplateName.VENTURE_CHAT)) {
String template = plugin.getVentureChatTemplate(bot.botNick, vcChannel, TemplateName.VENTURE_CHAT);
String template = plugin.getGameVentureChatTemplate(bot.botNick, vcChannel);
plugin.logDebug("VC Template: " + template);
bot.asyncIRCMessage(channelName, plugin.tokenizer
.ventureChatTokenizer(player, vcChannel, vcColor, message, template));

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

@ -2823,16 +2823,16 @@ public final class PurpleBot {
*/
if (isMessageEnabled(channelName, TemplateName.IRC_VENTURE_CHAT) && plugin.ventureChatEnabled) {
String vcChannel = ventureChatChannel.get(channelName);
String vcTemplate = plugin.getVentureChatTemplate(botNick, vcChannel, TemplateName.IRC_VENTURE_CHAT);
plugin.logDebug("broadcastChat [MV]: " + vcChannel + ": " + vcTemplate);
String rawMvMessage = filterMessage(
String vcTemplate = plugin.getIrcVentureChatTemplate(botNick, vcChannel);
plugin.logDebug("broadcastChat [VC]: " + vcChannel + ": " + vcTemplate);
String rawVcMessage = filterMessage(
plugin.tokenizer.ircChatToVentureChatTokenizer(this, user, channel, vcTemplate, message, vcChannel), channelName);
if (!rawMvMessage.isEmpty()) {
plugin.vcHook.sendMessage(vcChannel, rawMvMessage);
if (!rawVcMessage.isEmpty()) {
plugin.vcHook.sendMessage(vcChannel, rawVcMessage);
messageSent = true;
if (logIrcToVentureChat.containsKey(channelName)) {
if (logIrcToVentureChat.get(channelName)) {
plugin.getServer().getConsoleSender().sendMessage(rawMvMessage);
plugin.getServer().getConsoleSender().sendMessage(rawVcMessage);
}
}
}
@ -3036,8 +3036,8 @@ public final class PurpleBot {
}
}
// Broadcast action messages from IRC
/**
* Broadcast action messages from IRC
*
* @param user
* @param channel
@ -3053,7 +3053,10 @@ public final class PurpleBot {
plugin.logDebug("Ignoring action due to "
+ TemplateName.IRC_ACTION + " is false");
}
/*
Send IRC action messages to HeroChat if enabled
*/
if (isMessageEnabled(channelName, TemplateName.IRC_HERO_ACTION)) {
String hChannel = heroChannel.get(channelName);
String tmpl = plugin.getIrcHeroActionTemplate(botNick, hChannel);
@ -3069,6 +3072,25 @@ public final class PurpleBot {
}
}
}
/*
Send IRC action messages to VentureChat if enabled
*/
if (isMessageEnabled(channelName, TemplateName.IRC_VENTURE_ACTION) && plugin.ventureChatEnabled) {
String vcChannel = ventureChatChannel.get(channelName);
String vcTemplate = plugin.getIrcVentureChatActionTemplate(botNick, vcChannel);
plugin.logDebug("broadcastAction [VC]: " + vcChannel + ": " + vcTemplate);
String rawVcMessage = filterMessage(
plugin.tokenizer.ircChatToVentureChatTokenizer(this, user, channel, vcTemplate, message, vcChannel), channelName);
if (!rawVcMessage.isEmpty()) {
plugin.vcHook.sendMessage(vcChannel, rawVcMessage);
if (logIrcToVentureChat.containsKey(channelName)) {
if (logIrcToVentureChat.get(channelName)) {
plugin.getServer().getConsoleSender().sendMessage(rawVcMessage);
}
}
}
}
if (plugin.dynmapHook != null) {
if (isMessageEnabled(channelName, TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT)) {

20
src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View File

@ -504,9 +504,25 @@ public class PurpleIRC extends JavaPlugin {
public String getIrcHeroActionTemplate(String botName, String channel) {
return getMessageTemplate(ircHeroActionChannelMessages, botName, channel, TemplateName.IRC_HERO_ACTION);
}
public String getVentureChatTemplate(String botName, String channel, String template) {
return getMessageTemplate(ircVentureChatChannelMessages, botName, channel, template);
return getMessageTemplate(botName, channel, template);
}
public String getGameVentureChatTemplate(String botName, String channel) {
return getMessageTemplate(ventureChatChannelMessages, botName, channel, TemplateName.VENTURE_CHAT);
}
public String getGameVentureChatActionTemplate(String botName, String channel) {
return getMessageTemplate(ventureChatActionChannelMessages, botName, channel, TemplateName.VENTURE_CHAT_ACTION);
}
public String getIrcVentureChatTemplate(String botName, String channel) {
return getMessageTemplate(ircVentureChatChannelMessages, botName, channel, TemplateName.IRC_VENTURE_CHAT);
}
public String getIrcVentureChatActionTemplate(String botName, String channel) {
return getMessageTemplate(ircVentureChatActionChannelMessages, botName, channel, TemplateName.IRC_VENTURE_ACTION);
}
public String getIrcTownyChatTemplate(String botName, String channel) {