Don't send blank messages from IRC

cnaude · Mar 2, 2014 · 0f4538c · 0f4538c
1 parent d47a287
commit 0f4538c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -1194,7 +1194,7 @@ public void gameQuit(Player player, String message) {
             }
         }
     }
-    
+
     /**
      *
      * @param player
@@ -1209,13 +1209,13 @@ public void gameAchievement(Player player, Achievement achievement) {
             if (enabledMessages.get(channelName).contains(TemplateName.GAME_ACHIEVEMENT)) {
                 if (!isPlayerInValidWorld(player, channelName)) {
                     return;
-                }                
+                }
                 asyncIRCMessage(channelName, plugin.tokenizer
                         .gameChatToIRCTokenizer(player, plugin.getMsgTemplate(
                                         botNick, TemplateName.GAME_ACHIEVEMENT), message));
             }
         }
-    }    
+    }
 
     /**
      *
@@ -1781,7 +1781,9 @@ public void broadcastChat(String nick, String myChannel, String message, boolean
                     plugin.tokenizer.ircChatToGameTokenizer(
                             nick, myChannel, plugin.getMsgTemplate(
                                     botNick, TemplateName.IRC_CHAT), message), myChannel);
-            plugin.getServer().broadcast(newMessage, "irc.message.chat");
+            if (!newMessage.isEmpty()) {
+                plugin.getServer().broadcast(newMessage, "irc.message.chat");
+            }
         } else {
             plugin.logDebug("NOPE we can't broadcast due to " + TemplateName.IRC_CHAT
                     + " disabled");
@@ -1799,13 +1801,15 @@ public void broadcastChat(String nick, String myChannel, String message, boolean
             String hChannel = heroChannel.get(myChannel);
             String tmpl = plugin.getIRCHeroChatChannelTemplate(botNick, hChannel);
             plugin.logDebug("broadcastChat [HC]: " + hChannel + ": " + tmpl);
-            String rawHCMessage = plugin.tokenizer.ircChatToHeroChatTokenizer(
-                    nick, myChannel, tmpl, message, Herochat.getChannelManager(), hChannel);
-            Herochat.getChannelManager().getChannel(hChannel)
-                    .sendRawMessage(rawHCMessage);
-            if (logIrcToHeroChat.containsKey(myChannel)) {
-                if (logIrcToHeroChat.get(myChannel)) {
-                    plugin.getServer().getConsoleSender().sendMessage(rawHCMessage);
+            String rawHCMessage = filterMessage(
+                    plugin.tokenizer.ircChatToHeroChatTokenizer(
+                            nick, myChannel, tmpl, message, Herochat.getChannelManager(), hChannel), myChannel);
+            if (!rawHCMessage.isEmpty()) {
+                Herochat.getChannelManager().getChannel(hChannel).sendRawMessage(rawHCMessage);
+                if (logIrcToHeroChat.containsKey(myChannel)) {
+                    if (logIrcToHeroChat.get(myChannel)) {
+                        plugin.getServer().getConsoleSender().sendMessage(rawHCMessage);
+                    }
                 }
             }
         }

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java b/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java
@@ -41,7 +41,7 @@ public IRCMessageHandler(PurpleIRC plugin) {
      * @param message
      * @param privateMessage
      */
-    public void processMessage(PurpleBot ircBot, User user, Channel channel, String message, boolean privateMessage) {
+    public void processMessage(PurpleBot ircBot, User user, Channel channel, String message, boolean privateMessage) {                  
         plugin.logDebug("processMessage: " + message);
         String myChannel = channel.getName();
         if (ircBot.muteList.get(myChannel).contains(user.getNick())) {