__call__ should return the result

jsmnbom · jsmnbom · commit 61596400e18d · 2016-09-24T18:56:54.000+02:00
Also add tests with both &amp; and |.
diff --git a/telegram/ext/filters.py b/telegram/ext/filters.py
@@ -23,7 +23,7 @@ class BaseFilter(object):
     """Base class for all Message Filters"""
 
     def __call__(self, message):
-        self.filter(message)
+        return self.filter(message)
 
     def __and__(self, other):
         return MergedFilter(self, and_filter=other)
diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -23,14 +23,11 @@
 import sys
 import unittest
 from datetime import datetime
-
 import functools
 
-from telegram import MessageEntity
-
 sys.path.append('.')
 
-from telegram import Message, User, Chat
+from telegram import Message, User, Chat, MessageEntity
 from telegram.ext import Filters
 from tests.base import BaseTest
 
@@ -40,6 +37,7 @@ class FiltersTest(BaseTest, unittest.TestCase):
 
     def setUp(self):
         self.message = Message(0, User(0, "Testuser"), datetime.now(), Chat(0, 'private'))
+        self.e = functools.partial(MessageEntity, offset=0, length=0)
 
     def test_filters_text(self):
         self.message.text = 'test'
@@ -155,23 +153,19 @@ def test_filters_status_update(self):
         self.message.pinned_message = None
 
     def test_entities_filter(self):
-        e = functools.partial(MessageEntity, offset=0, length=0)
-
-        self.message.entities = [e(MessageEntity.MENTION)]
+        self.message.entities = [self.e(MessageEntity.MENTION)]
         self.assertTrue(Filters.entity(MessageEntity.MENTION)(self.message))
 
         self.message.entities = []
         self.assertFalse(Filters.entity(MessageEntity.MENTION)(self.message))
 
-        self.message.entities = [e(MessageEntity.BOLD)]
+        self.message.entities = [self.e(MessageEntity.BOLD)]
         self.assertFalse(Filters.entity(MessageEntity.MENTION)(self.message))
 
-        self.message.entities = [e(MessageEntity.BOLD), e(MessageEntity.MENTION)]
+        self.message.entities = [self.e(MessageEntity.BOLD), self.e(MessageEntity.MENTION)]
         self.assertTrue(Filters.entity(MessageEntity.MENTION)(self.message))
 
     def test_and_filters(self):
-        # For now just test with forwarded as that's the only one that makes sense
-        # That'll change when we get a entities filter
         self.message.text = 'test'
         self.message.forward_date = True
         self.assertTrue((Filters.text & Filters.forwarded)(self.message))
@@ -181,9 +175,16 @@ def test_and_filters(self):
         self.message.forward_date = None
         self.assertFalse((Filters.text & Filters.forwarded)(self.message))
 
+        self.message.text = 'test'
+        self.message.forward_date = True
+        self.message.entities = [self.e(MessageEntity.MENTION)]
+        self.assertTrue((Filters.text & Filters.forwarded & Filters.entity(MessageEntity.MENTION))(
+            self.message))
+        self.message.entities = [self.e(MessageEntity.BOLD)]
+        self.assertFalse((Filters.text & Filters.forwarded & Filters.entity(MessageEntity.MENTION)
+                         )(self.message))
+
     def test_or_filters(self):
-        # For now just test with forwarded as that's the only one that makes sense
-        # That'll change when we get a entities filter
         self.message.text = 'test'
         self.assertTrue((Filters.text | Filters.status_update)(self.message))
         self.message.group_chat_created = True
@@ -193,6 +194,18 @@ def test_or_filters(self):
         self.message.group_chat_created = False
         self.assertFalse((Filters.text | Filters.status_update)(self.message))
 
+    def test_and_or_filters(self):
+        self.message.text = 'test'
+        self.message.forward_date = True
+        self.assertTrue((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION))
+                        )(self.message))
+        self.message.forward_date = False
+        self.assertFalse((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION)
+                                         ))(self.message))
+        self.message.entities = [self.e(MessageEntity.MENTION)]
+        self.assertTrue((Filters.text & (Filters.forwarded | Filters.entity(MessageEntity.MENTION))
+                        )(self.message))
+
 
 if __name__ == '__main__':
     unittest.main()
