Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Commit

Permalink
Debug changes, and some refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnaude
cnaude committed May 6, 2015
1 parent 41484b7 commit 61b25a1
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 83 deletions.
4 changes: 3 additions & 1 deletion src/main/java/com/cnaude/purpleirc/Hooks/VanishHook.java
View file
Expand Up @@ -44,7 +44,9 @@ public VanishHook(PurpleIRC plugin) {
public boolean isVanished(Player player) {
// Try SuperVanish first
if (plugin.superVanishHook != null) {
return plugin.superVanishHook.isVanished(player);
boolean isPlayerVanish = plugin.superVanishHook.isVanished(player);
plugin.logDebug("isVanished: " + player.getName() + ":" + isPlayerVanish);
return isPlayerVanish;
} else {
// Fallback to other Vanish
if (player.hasMetadata("vanished")) {
Expand Down
117 changes: 36 additions & 81 deletions src/main/java/com/cnaude/purpleirc/PurpleBot.java
View file
Expand Up @@ -1146,17 +1146,13 @@ public void townyChat(Player player, com.palmergames.bukkit.TownyChat.channels.C
if (!isPlayerInValidWorld(player, channelName)) {
continue;
}
plugin.logDebug("townyChat: Checking for towny-"
+ townyChannel.getName() + "-chat"
+ " or " + "towny-" + townyChannel.getChannelTag() + "-chat"
+ " or towny-chat");
if (isMessageEnabled(channelName, "towny-" + townyChannel.getName() + "-chat")
|| isMessageEnabled(channelName, "towny-" + townyChannel.getChannelTag() + "-chat")
|| isMessageEnabled(channelName, "towny-chat")
|| isMessageEnabled(channelName, "towny-channel-chat")) {
|| isMessageEnabled(channelName, TemplateName.TOWNY_CHAT)
|| isMessageEnabled(channelName, TemplateName.TOWNY_CHANNEL_CHAT)) {
asyncIRCMessage(channelName, plugin.tokenizer
.chatTownyChannelTokenizer(player, townyChannel, message,
plugin.getMsgTemplate(botNick, "towny-channel-chat")));
plugin.getMsgTemplate(botNick, TemplateName.TOWNY_CHANNEL_CHAT)));
}
}
}
Expand Down Expand Up @@ -1406,7 +1402,9 @@ public void dynmapWebChat(String source, String name, String message) {
return;
}
for (String channelName : botChannels) {
plugin.logDebug("dynmapWebChat: " + channelName);
if (isMessageEnabled(channelName, TemplateName.DYNMAP_WEB_CHAT)) {
plugin.logDebug("dynmapWebChat: sending message");
asyncIRCMessage(channelName, plugin.tokenizer
.dynmapWebChatToIRCTokenizer(source, name, plugin.getMsgTemplate(
botNick, TemplateName.DYNMAP_WEB_CHAT),
Expand Down Expand Up @@ -1442,12 +1440,8 @@ public void redditStreamBroadcast(String message) {
}
for (String channelName : botChannels) {
if (isMessageEnabled(channelName, TemplateName.REDDIT_MESSAGES)) {
plugin.logDebug("Checking if " + TemplateName.REDDIT_MESSAGES + " is enabled... YES");
asyncIRCMessage(channelName, plugin.tokenizer.gameChatToIRCTokenizer(plugin.getMsgTemplate(botNick, TemplateName.REDDIT_MESSAGES), message));
} else {
plugin.logDebug("Checking if " + TemplateName.REDDIT_MESSAGES + " is enabled... NOPE");
}

}
}
}

Expand All @@ -1466,7 +1460,6 @@ public void gameJoin(Player player, String message) {
return;
}
if (hideJoinWhenVanished.get(channelName)) {
plugin.logDebug("Checking if player " + player.getName() + " is vanished.");
if (plugin.vanishHook.isVanished(player)) {
plugin.logDebug("Not sending join message to IRC for player "
+ player.getName() + " due to being vanished.");
Expand All @@ -1476,9 +1469,7 @@ public void gameJoin(Player player, String message) {
asyncIRCMessage(channelName, plugin.tokenizer
.gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
botNick, TemplateName.GAME_JOIN), message));
} else {
plugin.logDebug("Not sending join message due to " + TemplateName.GAME_JOIN + " being disabled");
}
}
}
}

Expand All @@ -1497,8 +1488,7 @@ public void gameQuit(Player player, String message) {
return;
}
if (hideQuitWhenVanished.get(channelName)) {
plugin.logDebug("Checking if player " + player.getName()
+ " is vanished.");
plugin.logDebug("Checking if player " + player.getName() + " is vanished.");
if (plugin.vanishHook.isVanished(player)) {
plugin.logDebug("Not sending quit message to IRC for player "
+ player.getName() + " due to being vanished.");
Expand Down Expand Up @@ -2329,9 +2319,7 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
Send messages to Dynmap if enabled
*/
if (plugin.dynmapHook != null) {
plugin.logDebug("Checking if " + TemplateName.IRC_DYNMAP_WEB_CHAT + " is enabled ...");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_DYNMAP_WEB_CHAT)) {
plugin.logDebug("Yes, " + TemplateName.IRC_DYNMAP_WEB_CHAT + " is enabled...");
if (isMessageEnabled(myChannel,TemplateName.IRC_DYNMAP_WEB_CHAT)) {
plugin.logDebug("broadcastChat [DW]: " + message);
String template = plugin.getMsgTemplate(botNick, TemplateName.IRC_DYNMAP_WEB_CHAT);
String rawDWMessage = filterMessage(
Expand All @@ -2340,18 +2328,14 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
String rawNick = nickTmpl.replace("%NICK%", user.getNick());
plugin.dynmapHook.sendMessage(rawNick, rawDWMessage);
messageSent = true;
} else {
plugin.logDebug("Nope, " + TemplateName.IRC_DYNMAP_WEB_CHAT + " is NOT enabled...");
}
}
}

/*
Send messages to TownyChat if enabled
*/
if (plugin.tcHook != null) {
plugin.logDebug("Checking if " + TemplateName.IRC_TOWNY_CHAT + " is enabled ...");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_TOWNY_CHAT)) {
plugin.logDebug("Yes, " + TemplateName.IRC_TOWNY_CHAT + " is enabled...");
if (isMessageEnabled(myChannel,TemplateName.IRC_TOWNY_CHAT)) {
if (townyChannel.containsKey(myChannel)) {
String tChannel = townyChannel.get(myChannel);
if (!tChannel.isEmpty()) {
Expand All @@ -2363,32 +2347,26 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
messageSent = true;
}
}
} else {
plugin.logDebug("Nope, " + TemplateName.IRC_TOWNY_CHAT + " is NOT enabled...");
}
}
}

/*
Send messages to players if enabled
*/
plugin.logDebug("Checking if " + TemplateName.IRC_CHAT + " is enabled before broadcasting chat from IRC");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_CHAT) || override) {
plugin.logDebug("Yup we can broadcast due to " + TemplateName.IRC_CHAT + " enabled");
if (isMessageEnabled(myChannel, TemplateName.IRC_CHAT) || override) {
String newMessage = filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMsgTemplate(
botNick, TemplateName.IRC_CHAT), message), myChannel);
if (!newMessage.isEmpty()) {
plugin.getServer().broadcast(newMessage, "irc.message.chat");
messageSent = true;
}
} else {
plugin.logDebug("NOPE we can't broadcast due to " + TemplateName.IRC_CHAT + " disabled");
}

}

/*
Send messages to console if enabled
*/
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_CONSOLE_CHAT)) {
if (isMessageEnabled(myChannel, TemplateName.IRC_CONSOLE_CHAT)) {
String tmpl = plugin.getMsgTemplate(botNick, TemplateName.IRC_CONSOLE_CHAT);
plugin.logDebug("broadcastChat [Console]: " + tmpl);
plugin.getServer().getConsoleSender().sendMessage(plugin.tokenizer.ircChatToGameTokenizer(
Expand All @@ -2399,8 +2377,7 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
/*
Send messages to Herochat if enabled
*/
plugin.logDebug("Checking if " + TemplateName.IRC_HERO_CHAT + " is enabled before broadcasting chat from IRC to HeroChat");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_HERO_CHAT)) {
if (isMessageEnabled(myChannel,TemplateName.IRC_HERO_CHAT)) {
String hChannel = heroChannel.get(myChannel);
String tmpl = plugin.getIRCHeroChatChannelTemplate(botNick, hChannel);
plugin.logDebug("broadcastChat [HC]: " + hChannel + ": " + tmpl);
Expand All @@ -2415,53 +2392,42 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
}
}
}
} else {
plugin.logDebug("NOPE we can't broadcast to HeroChat due to " + TemplateName.IRC_HERO_CHAT + " disabled");
}
}

/*
Send messages to Essentials if enabled
*/
if (plugin.isPluginEnabled("Essentials")) {
plugin.logDebug("Checking if " + TemplateName.IRC_ESS_HELPOP + " is enabled before broadcasting chat from IRC");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_ESS_HELPOP) || override) {
plugin.logDebug("Yup we can broadcast due to " + TemplateName.IRC_ESS_HELPOP + " enabled");
if (isMessageEnabled(myChannel,TemplateName.IRC_ESS_HELPOP) || override) {
String newMessage = filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMsgTemplate(
botNick, TemplateName.IRC_ESS_HELPOP), message), myChannel);
if (!newMessage.isEmpty()) {
plugin.getServer().broadcast(newMessage, "essentials.helpop.receive");
messageSent = true;
}
} else {
plugin.logDebug("NOPE we can't broadcast due to " + TemplateName.IRC_ESS_HELPOP
+ " disabled");
}
}
}

/*
Send messages to AdminPrivateChat if enabled
*/
if (plugin.adminPrivateChatHook != null) {
plugin.logDebug("Checking if " + TemplateName.IRC_A_CHAT + " is enabled before broadcasting chat from IRC");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_A_CHAT) || override) {
plugin.logDebug("Yup we can broadcast due to " + TemplateName.IRC_A_CHAT + " enabled");
if (plugin.adminPrivateChatHook != null) {
if (isMessageEnabled(myChannel,TemplateName.IRC_A_CHAT) || override) {
String newMessage = filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, plugin.getMsgTemplate(
botNick, TemplateName.IRC_A_CHAT), message), myChannel);
if (!newMessage.isEmpty()) {
plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick());
messageSent = true;
}
} else {
plugin.logDebug("NOPE we can't broadcast due to " + TemplateName.IRC_A_CHAT + " disabled");
}
}
}

/*
Notify IRC user that message was sent.
*/
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_CHAT_RESPONSE) && messageSent && target != null) {
if (isMessageEnabled(myChannel,TemplateName.IRC_CHAT_RESPONSE) && messageSent && target != null) {
// Let the sender know the message was sent
String responseTemplate = plugin.getMsgTemplate(botNick, TemplateName.IRC_CHAT_RESPONSE);
if (!responseTemplate.isEmpty()) {
Expand Down Expand Up @@ -2495,7 +2461,6 @@ public void broadcastHeroChat(User user, org.pircbotx.Channel channel, String ta
String msg;
hChannel = message.split(" ", 2)[0];
msg = message.split(" ", 2)[1];
plugin.logDebug("Check if " + TemplateName.IRC_HERO_CHAT + " is enabled before broadcasting chat from IRC");
if (enabledMessages.get(ircChannel).contains(TemplateName.IRC_HERO_CHAT)) {
plugin.logDebug("Checking if " + hChannel + " is a valid hero channel...");
if (Herochat.getChannelManager().hasChannel(hChannel)) {
Expand All @@ -2518,10 +2483,7 @@ public void broadcastHeroChat(User user, org.pircbotx.Channel channel, String ta
} else {
asyncIRCMessage(target, "Hero channel \"" + hChannel + "\" does not exist!");
}
} else {
plugin.logDebug("NOPE we can't broadcast due to "
+ TemplateName.IRC_HERO_CHAT + " disabled");
}
}
} else {
asyncIRCMessage(target, "No message specified.");
}
Expand All @@ -2547,10 +2509,7 @@ public void playerChat(User user, org.pircbotx.Channel channel, String target, S
String msg;
pName = message.split(" ", 2)[0];
msg = message.split(" ", 2)[1];
plugin.logDebug("Check if " + TemplateName.IRC_PCHAT + " is enabled before broadcasting chat from IRC");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_PCHAT)) {
plugin.logDebug("Yup we can broadcast due to " + TemplateName.IRC_PCHAT
+ " enabled... Checking if " + pName + " is a valid player...");
if (isMessageEnabled(myChannel,TemplateName.IRC_PCHAT)) {
Player player = plugin.getServer().getPlayer(pName);
if (player != null) {
if (player.isOnline()) {
Expand All @@ -2572,9 +2531,7 @@ public void playerChat(User user, org.pircbotx.Channel channel, String target, S
} else {
asyncIRCMessage(target, "Player not found (possibly offline): " + pName);
}
} else {
plugin.logDebug("NOPE we can't broadcast due to irc-pchat disabled");
}
}
} else {
asyncIRCMessage(target, "No message specified.");
}
Expand All @@ -2589,7 +2546,7 @@ public void playerChat(User user, org.pircbotx.Channel channel, String target, S
*/
public void broadcastAction(User user, org.pircbotx.Channel channel, String message) {
String myChannel = channel.getName();
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_ACTION)) {
if (isMessageEnabled(myChannel,TemplateName.IRC_ACTION)) {
plugin.getServer().broadcast(plugin.tokenizer.ircChatToGameTokenizer(
this, user, channel, plugin.getMsgTemplate(botNick,
TemplateName.IRC_ACTION), message), "irc.message.action");
Expand All @@ -2598,7 +2555,7 @@ public void broadcastAction(User user, org.pircbotx.Channel channel, String mess
+ TemplateName.IRC_ACTION + " is false");
}

if (enabledMessages.get(myChannel).contains(TemplateName.IRC_HERO_ACTION)) {
if (isMessageEnabled(myChannel,TemplateName.IRC_HERO_ACTION)) {
String hChannel = heroChannel.get(myChannel);
String tmpl = plugin.getIRCHeroActionChannelTemplate(botNick, hChannel);
plugin.logDebug("broadcastChat [HA]: " + hChannel + ": " + tmpl);
Expand All @@ -2615,16 +2572,12 @@ public void broadcastAction(User user, org.pircbotx.Channel channel, String mess
}

if (plugin.dynmapHook != null) {
plugin.logDebug("xChecking if " + TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT + " is enabled ...");
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT)) {
plugin.logDebug("Yes, " + TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT + " is enabled...");
if (isMessageEnabled(myChannel,TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT)) {
String template = plugin.getMsgTemplate(botNick, TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT);
String rawDWMessage = filterMessage(
plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, template, message), myChannel);
plugin.dynmapHook.sendMessage(user.getNick(), rawDWMessage);
} else {
plugin.logDebug("Nope, " + TemplateName.IRC_ACTION_DYNMAP_WEB_CHAT + " is NOT enabled...");
}
}
}
}

Expand All @@ -2637,14 +2590,14 @@ public void broadcastAction(User user, org.pircbotx.Channel channel, String mess
*/
public void broadcastIRCKick(User recipient, User kicker, String reason, org.pircbotx.Channel channel) {
String myChannel = channel.getName();
if (enabledMessages.get(myChannel).contains(TemplateName.IRC_KICK)) {
if (isMessageEnabled(myChannel,TemplateName.IRC_KICK)) {
plugin.getServer().broadcast(plugin.tokenizer.ircKickTokenizer(
this, recipient, kicker, reason, channel, plugin.getMsgTemplate(
botNick, TemplateName.IRC_KICK)),
"irc.message.kick");
}

if (enabledMessages.get(myChannel).contains(TemplateName.IRC_HERO_KICK)) {
if (isMessageEnabled(myChannel,TemplateName.IRC_HERO_KICK)) {
Herochat.getChannelManager().getChannel(heroChannel.get(myChannel))
.sendRawMessage(plugin.tokenizer
.ircKickToHeroChatTokenizer(this,
Expand Down Expand Up @@ -2793,7 +2746,9 @@ public void broadcastIRCTopic(User user, org.pircbotx.Channel channel, String me
* @return
*/
public boolean isMessageEnabled(String channelName, String templateName) {
return enabledMessages.get(channelName).contains(templateName);
boolean isEnabled = enabledMessages.get(channelName).contains(templateName);
plugin.logDebug("[isMessageEnabled] " + channelName + ":" + templateName + ":" + isEnabled);
return isEnabled;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View file
Expand Up @@ -482,7 +482,7 @@ public String getMsgTemplate(String botName, String tmpl) {
if (messageTmpl.get(MAINCONFIG).containsKey(tmpl)) {
return messageTmpl.get(MAINCONFIG).get(tmpl);
}
return "INVALID TEMPLATE";
return "INVALID TEMPLATE: " + botName + ":" + tmpl;
}

public String getMsgTemplate(String tmpl) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/cnaude/purpleirc/TemplateName.java
View file
Expand Up @@ -67,6 +67,7 @@ public class TemplateName {
public final static String IRC_TITAN_CHAT = "irc-titan-chat";

public final static String TOWNY_CHAT = "towny-chat";
public final static String TOWNY_CHANNEL_CHAT = "towny-channel-chat";
public final static String IRC_TOWNY_CHAT = "irc-towny-chat";

public final static String FACTION_PUBLIC_CHAT = "faction-public-chat";
Expand Down

0 comments on commit 61b25a1

Please sign in to comment.