diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java index 07dc3ab..ab74576 100644 --- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java +++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java @@ -1735,6 +1735,20 @@ public void broadcastChat(String nick, String myChannel, String message, boolean plugin.logDebug("Check if " + TemplateName.IRC_CHAT + " is enabled before broadcasting chat from IRC"); if (enabledMessages.get(myChannel).contains(TemplateName.IRC_CHAT) || override) { + if (filters.containsKey(myChannel)) { + if (!filters.get(myChannel).isEmpty()) { + for (String filter : filters.get(myChannel)) { + if (filter.startsWith("/") && filter.endsWith("/")) { + filter = filter.substring(1, filter.length() - 1); + plugin.logDebug("Regex filtering " + filter + " from " + message); + message = message.replaceAll(filter, ""); + } else { + plugin.logDebug("Filtering " + filter + " from " + message); + message = message.replace(filter, ""); + } + } + } + } plugin.logDebug("Yup we can broadcast due to " + TemplateName.IRC_CHAT + " enabled"); plugin.getServer().broadcast(plugin.tokenizer.ircChatToGameTokenizer( nick, myChannel, plugin.getMsgTemplate(botNick, diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java b/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java index 3c97ccc..9065c42 100644 --- a/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java +++ b/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java @@ -179,21 +179,7 @@ public void processMessage(PurpleBot ircBot, User user, Channel channel, String if (privateMessage && !ircBot.relayPrivateChat) { plugin.logDebug("Message NOT dispatched for broadcast due to \"relay-private-chat\" being false and this is a private message ..."); return; - } - if (ircBot.filters.containsKey(myChannel)) { - if (!ircBot.filters.get(myChannel).isEmpty()) { - for (String filter : ircBot.filters.get(myChannel)) { - if (filter.startsWith("/") && filter.endsWith("/")) { - filter = filter.substring(1, filter.length() - 1); - plugin.logDebug("Regex filtering " + filter + " from " + message); - message = message.replaceAll(filter, ""); - } else { - plugin.logDebug("Filtering " + filter + " from " + message); - message = message.replace(filter, ""); - } - } - } - } + } plugin.logDebug("Message dispatched for broadcast..."); ircBot.broadcastChat(user.getNick(), myChannel, message, false); }