From 2161681131aa9d3fcee1a49953fff61c62ecb5dd Mon Sep 17 00:00:00 2001
From: Jacob Bom <bomjacob@gmail.com>
Date: Sat, 24 Sep 2016 18:20:32 +0200
Subject: [PATCH] Use filter method instead of __call__

__call__ is scary looking for users wanted to create their own filters.
Also allows us to put additional logic in __call__ if we want in the future.
---
 telegram/ext/filters.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/telegram/ext/filters.py b/telegram/ext/filters.py
index 9c44f21b6..a23f00859 100644
--- 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):
-        raise NotImplementedError('Please implement a call method in your filter.')
+        self.filter(message)
 
     def __and__(self, other):
         return MergedFilter(self, and_filter=other)
@@ -31,6 +31,9 @@ class BaseFilter(object):
     def __or__(self, other):
         return MergedFilter(self, or_filter=other)
 
+    def filter(self, message):
+        raise NotImplementedError
+
 
 class MergedFilter(BaseFilter):
     """Represents a filter consisting of two other filters."""
@@ -40,7 +43,7 @@ class MergedFilter(BaseFilter):
         self.and_filter = and_filter
         self.or_filter = or_filter
 
-    def __call__(self, message):
+    def filter(self, message):
         if self.and_filter:
             return self.base_filter(message) and self.and_filter(message)
         elif self.or_filter:
@@ -55,84 +58,84 @@ class Filters(object):
 
     class Text(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.text and not message.text.startswith('/'))
 
     text = Text()
 
     class Command(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.text and message.text.startswith('/'))
 
     command = Command()
 
     class Audio(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.audio)
 
     audio = Audio()
 
     class Document(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.document)
 
     document = Document()
 
     class Photo(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.photo)
 
     photo = Photo()
 
     class Sticker(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.sticker)
 
     sticker = Sticker()
 
     class Video(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.video)
 
     video = Video()
 
     class Voice(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.voice)
 
     voice = Voice()
 
     class Contact(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.contact)
 
     contact = Contact()
 
     class Location(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.location)
 
     location = Location()
 
     class Venue(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.venue)
 
     venue = Venue()
 
     class StatusUpdate(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.new_chat_member or message.left_chat_member
                         or message.new_chat_title or message.new_chat_photo
                         or message.delete_chat_photo or message.group_chat_created
@@ -144,7 +147,7 @@ class Filters(object):
 
     class Forwarded(BaseFilter):
 
-        def __call__(self, message):
+        def filter(self, message):
             return bool(message.forward_date)
 
     forwarded = Forwarded()