add filters at first

z44d · Jul 14, 2024 · ebab462 · ebab462
1 parent f3f8594
commit ebab462
Showing 1 changed file with 60 additions and 22 deletions.
diff --git a/tgram/decorators.py b/tgram/decorators.py
@@ -24,7 +24,9 @@ def decorator(func: Callable) -> Callable:
     def on_message(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.MESSAGE, filters=filters or all
+                callback=func,
+                type=Handlers.MESSAGE,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -41,7 +43,9 @@ def decorator(func: Callable) -> Callable:
     def on_edited_message(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.EDITED_MESSAGE, filters=filters or all
+                callback=func,
+                type=Handlers.EDITED_MESSAGE,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -58,7 +62,9 @@ def decorator(func: Callable) -> Callable:
     def on_channel_post(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.CHANNEL_POST, filters=filters or all
+                callback=func,
+                type=Handlers.CHANNEL_POST,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -75,7 +81,9 @@ def decorator(func: Callable) -> Callable:
     def on_edited_channel_post(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.EDITED_CHANNEL_POST, filters=filters or all
+                callback=func,
+                type=Handlers.EDITED_CHANNEL_POST,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -92,7 +100,9 @@ def decorator(func: Callable) -> Callable:
     def on_business_connection(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.BUSINESS_CONNECTION, filters=filters or all
+                callback=func,
+                type=Handlers.BUSINESS_CONNECTION,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -109,7 +119,9 @@ def decorator(func: Callable) -> Callable:
     def on_business_message(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.BUSINESS_MESSAGE, filters=filters or all
+                callback=func,
+                type=Handlers.BUSINESS_MESSAGE,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -128,7 +140,7 @@ def decorator(func: Callable) -> Callable:
             handler = Handler(
                 callback=func,
                 type=Handlers.EDITED_BUSINESS_MESSAGE,
-                filters=filters or all,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -147,7 +159,7 @@ def decorator(func: Callable) -> Callable:
             handler = Handler(
                 callback=func,
                 type=Handlers.DELETED_BUSINESS_MESSAGES,
-                filters=filters or all,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -164,7 +176,9 @@ def decorator(func: Callable) -> Callable:
     def on_message_reaction(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.MESSAGE_REACTION, filters=filters or all
+                callback=func,
+                type=Handlers.MESSAGE_REACTION,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -183,7 +197,7 @@ def decorator(func: Callable) -> Callable:
             handler = Handler(
                 callback=func,
                 type=Handlers.MESSAGE_REACTION_COUNT,
-                filters=filters or all,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -200,7 +214,9 @@ def decorator(func: Callable) -> Callable:
     def on_inline_query(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.INLINE_QUERY, filters=filters or all
+                callback=func,
+                type=Handlers.INLINE_QUERY,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -219,7 +235,7 @@ def decorator(func: Callable) -> Callable:
             handler = Handler(
                 callback=func,
                 type=Handlers.CHOSEN_INLINE_RESULT,
-                filters=filters or all,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -236,7 +252,9 @@ def decorator(func: Callable) -> Callable:
     def on_callback_query(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.CALLBACK_QUERY, filters=filters or all
+                callback=func,
+                type=Handlers.CALLBACK_QUERY,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -253,7 +271,9 @@ def decorator(func: Callable) -> Callable:
     def on_shipping_query(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.SHIPPING_QUERY, filters=filters or all
+                callback=func,
+                type=Handlers.SHIPPING_QUERY,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -270,7 +290,9 @@ def decorator(func: Callable) -> Callable:
     def on_pre_checkout_query(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.PRE_CHECKOUT_QUERY, filters=filters or all
+                callback=func,
+                type=Handlers.PRE_CHECKOUT_QUERY,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -286,7 +308,11 @@ def decorator(func: Callable) -> Callable:
 
     def on_poll(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
-            handler = Handler(callback=func, type=Handlers.POLL, filters=filters or all)
+            handler = Handler(
+                callback=func,
+                type=Handlers.POLL,
+                filters=self if isinstance(self, Filter) else (filters or all),
+            )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
             else:
@@ -302,7 +328,9 @@ def decorator(func: Callable) -> Callable:
     def on_poll_answer(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.POLL_ANSWER, filters=filters or all
+                callback=func,
+                type=Handlers.POLL_ANSWER,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -319,7 +347,9 @@ def decorator(func: Callable) -> Callable:
     def on_my_chat_member(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.MY_CHAT_MEMBER, filters=filters or all
+                callback=func,
+                type=Handlers.MY_CHAT_MEMBER,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -336,7 +366,9 @@ def decorator(func: Callable) -> Callable:
     def on_chat_member(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.CHAT_MEMBER, filters=filters or all
+                callback=func,
+                type=Handlers.CHAT_MEMBER,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -353,7 +385,9 @@ def decorator(func: Callable) -> Callable:
     def on_chat_join_request(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.CHAT_JOIN_REQUEST, filters=filters or all
+                callback=func,
+                type=Handlers.CHAT_JOIN_REQUEST,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -370,7 +404,9 @@ def decorator(func: Callable) -> Callable:
     def on_chat_boost(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.CHAT_BOOST, filters=filters or all
+                callback=func,
+                type=Handlers.CHAT_BOOST,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)
@@ -387,7 +423,9 @@ def decorator(func: Callable) -> Callable:
     def on_removed_chat_boost(self=None, filters: Filter = None):
         def decorator(func: Callable) -> Callable:
             handler = Handler(
-                callback=func, type=Handlers.REMOVED_CHAT_BOOST, filters=filters or all
+                callback=func,
+                type=Handlers.REMOVED_CHAT_BOOST,
+                filters=self if isinstance(self, Filter) else (filters or all),
             )
             if isinstance(self, tgram.TgBot):
                 self.add_handler(handler)