From 7fdb9a1e55869c6424f5dd4882147487c14f93a6 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Wed, 8 Apr 2020 18:19:06 +0100
Subject: fix regression of message filters not matching without formatting

---
 modules/message_filter.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/message_filter.py b/modules/message_filter.py
index a6191a66..0eb08ccf 100644
--- a/modules/message_filter.py
+++ b/modules/message_filter.py
@@ -31,14 +31,16 @@ class Module(ModuleManager.BaseModule):
         filters = self._get_filters(event["server"], target)
         for filter in filters:
             sed = utils.parse.sed.parse(filter)
-            type, out = utils.parse.sed.sed(sed, message)
 
-            if type == "m" and out:
-                self.log.info("Message matched filter, dropping: %s"
-                    % event["line"].format())
-                event["line"].invalidate()
-                return
-            elif type == "s":
+            if sed.type == "m":
+                out = utils.parse.sed.sed(sed, message_plain)
+                if out:
+                    self.log.info("Message matched filter, dropping: %s"
+                        % event["line"].format())
+                    event["line"].invalidate()
+                    return
+            elif sed.type == "s":
+                out = utils.parse.sed.sed(sed, message)
                 message = out
 
         if not message == original_message:
-- 
cgit v1.3.1-10-gc9f91