update_filter attribute on filters

Eldinnie · Eldinnie · commit c5d5680211f2 · 2018-05-22T22:28:55.000+02:00
Makes it possible to have filters work on an update instead of message, while keeping behavior for current filters
diff --git a/telegram/ext/commandhandler.py b/telegram/ext/commandhandler.py
@@ -160,7 +160,7 @@ def check_update(self, update):
                         command[1].lower() == message.bot.username.lower()):
                     return None
 
-                if self.filters is None or self.filters(message):
+                if self.filters is None or self.filters(update):
                     return args
 
     def collect_optional_args(self, dispatcher, update=None, check_result=None):
@@ -315,5 +315,5 @@ def check_update(self, update):
             text_list = message.text.split()
             if text_list[0].lower() not in self.command:
                 return None
-            if self.filters is None or self.filters(message):
+            if self.filters is None or self.filters(update):
                 return text_list[1:]
diff --git a/telegram/ext/filters.py b/telegram/ext/filters.py
@@ -60,9 +60,13 @@ class variable.
     """
 
     name = None
+    update_filter = False
 
-    def __call__(self, message):
-        return self.filter(message)
+    def __call__(self, update):
+        if self.update_filter:
+            return self.filter(update)
+        else:
+            return self.filter(update.effective_message)
 
     def __and__(self, other):
         return MergedFilter(self, and_filter=other)
@@ -100,12 +104,13 @@ class InvertedFilter(BaseFilter):
         f: The filter to invert.
 
     """
+    update_filter = True
 
     def __init__(self, f):
         self.f = f
 
-    def filter(self, message):
-        return not self.f(message)
+    def filter(self, update):
+        return not self.f(update)
 
     def __repr__(self):
         return "<inverted {}>".format(self.f)
@@ -120,17 +125,18 @@ class MergedFilter(BaseFilter):
         or_filter: Optional filter to "or" with base_filter. Mutually exclusive with and_filter.
 
     """
+    update_filter = True
 
     def __init__(self, base_filter, and_filter=None, or_filter=None):
         self.base_filter = base_filter
         self.and_filter = and_filter
         self.or_filter = or_filter
 
-    def filter(self, message):
+    def filter(self, update):
         if self.and_filter:
-            return self.base_filter(message) and self.and_filter(message)
+            return self.base_filter(update) and self.and_filter(update)
         elif self.or_filter:
-            return self.base_filter(message) or self.or_filter(message)
+            return self.base_filter(update) or self.or_filter(update)
 
     def __repr__(self):
         return "<{} {} {}>".format(self.base_filter, "and" if self.and_filter else "or",
@@ -159,6 +165,7 @@ class _Text(BaseFilter):
         name = 'Filters.text'
 
         def filter(self, message):
+            print('text_filter_filter {}'.format(repr(self)))
             return bool(message.text and not message.text.startswith('/'))
 
     text = _Text()
@@ -380,6 +387,7 @@ class _StatusUpdate(BaseFilter):
             ``Filters.status_update`` for all status update messages.
 
         """
+        update_filter = True
 
         class _NewChatMembers(BaseFilter):
             name = 'Filters.status_update.new_chat_members'
diff --git a/telegram/ext/messagehandler.py b/telegram/ext/messagehandler.py
@@ -148,4 +148,4 @@ def check_update(self, update):
             if not self.filters:
                 return True
             else:
-                return self.filters(update.effective_message)
+                return self.filters(update)
diff --git a/tests/test_filters.py b/tests/test_filters.py
