Only filter messages when enable-filtering is true.

cnaude · Jun 7, 2015 · c5e1be7 · c5e1be7
1 parent 1101fa4
commit c5e1be7
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -2323,17 +2323,27 @@ public void voiceIrcUser(Channel channel, User user) {
         }
     }
 
+    /**
+     *
+     * @param message
+     * @param channelName
+     * @return
+     */
     public String filterMessage(String message, String channelName) {
-        if (filters.containsKey(channelName)) {
-            if (!filters.get(channelName).isEmpty()) {
-                for (String filter : filters.get(channelName)) {
-                    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, "");
+        if (enableMessageFiltering.containsKey(channelName)) {
+            if (enableMessageFiltering.get(channelName)) {
+                if (filters.containsKey(channelName)) {
+                    if (!filters.get(channelName).isEmpty()) {
+                        for (String filter : filters.get(channelName)) {
+                            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, "");
+                            }
+                        }
                     }
                 }
             }