Add filters support for raw handler

Co-authored-by: KurimuzonAkuma <[email protected]>

Author: SpEcHiDe

pyrogram/dispatcher.py

@@ -331,7 +331,12 @@ async def handler_worker(self, lock):
                                     continue
 
                             elif isinstance(handler, RawUpdateHandler):
-                                args = (update, users, chats)
+                                try:
+                                    if await handler.check(self.client, update):
+                                        args = (update, users, chats)
+                                except Exception as e:
+                                    log.exception(e)
+                                    continue
 
                             if args is None:
                                 continue

pyrogram/filters.py

@@ -136,7 +136,7 @@ def create(func: Callable, name: str = None, **kwargs) -> Filter:
             The *filter* argument refers to the filter itself and can be used to access keyword arguments (read below).
             The *client* argument refers to the :obj:`~pyrogram.Client` that received the update.
             The *update* argument type will vary depending on which `Handler <handlers>`_ is coming from.
-            For example, in a :obj:`~pyrogram.handlers.MessageHandler` the *update* argument will be a :obj:`~pyrogram.types.Message`; in a :obj:`~pyrogram.handlers.CallbackQueryHandler` the *update* will be a :obj:`~pyrogram.types.CallbackQuery`.
+            For example, in a :obj:`~pyrogram.handlers.MessageHandler` the *update* argument will be a :obj:`~pyrogram.types.Message`; in a :obj:`~pyrogram.handlers.CallbackQueryHandler` the *update* will be a :obj:`~pyrogram.types.CallbackQuery`; in a :obj:`~pyrogram.handlers.RawUpdateHandler` the *update* will be a :obj:`~pyrogram.raw.base.Update`.
             Your function body can then access the incoming update attributes and decide whether to allow it or not.
 
         name (``str``, *optional*):
@@ -146,6 +146,7 @@ def create(func: Callable, name: str = None, **kwargs) -> Filter:
         **kwargs (``any``, *optional*):
             Any keyword argument you would like to pass. Useful when creating parameterized custom filters, such as
             :meth:`~pyrogram.filters.command` or :meth:`~pyrogram.filters.regex`.
+
     """
     return type(
         name or func.__name__ or CUSTOM_FILTER_NAME,

pyrogram/handlers/raw_update_handler.py

@@ -33,6 +33,10 @@ class RawUpdateHandler(Handler):
             A function that will be called when a new update is received from the server. It takes
             *(client, update, users, chats)* as positional arguments (look at the section below for
             a detailed description).
+        
+        filters (:obj:`Filters`):
+            Pass one or more filters to allow only a subset of callback queries to be passed
+            in your callback function.
 
     Other Parameters:
         client (:obj:`~pyrogram.Client`):
@@ -63,5 +67,5 @@ class RawUpdateHandler(Handler):
         - :obj:`~pyrogram.raw.types.ChannelForbidden`
     """
 
-    def __init__(self, callback: Callable):
-        super().__init__(callback)
+    def __init__(self, callback: Callable, filters=None):
+        super().__init__(callback, filters)

pyrogram/methods/decorators/on_raw_update.py

@@ -19,11 +19,13 @@
 from typing import Callable
 
 import pyrogram
+from pyrogram.filters import Filter
 
 
 class OnRawUpdate:
     def on_raw_update(
         self=None,
+        filters=None,
         group: int = 0
     ) -> Callable:
         """Decorator for handling raw updates.
@@ -32,21 +34,25 @@ def on_raw_update(
         :obj:`~pyrogram.handlers.RawUpdateHandler`.
 
         Parameters:
+            filters (:obj:`~pyrogram.filters`, *optional*):
+                Pass one or more filters to allow only a subset of callback queries
+                to be passed in your callback function.
+
             group (``int``, *optional*):
                 The group identifier, defaults to 0.
         """
 
         def decorator(func: Callable) -> Callable:
             if isinstance(self, pyrogram.Client):
-                self.add_handler(pyrogram.handlers.RawUpdateHandler(func), group)
-            else:
+                self.add_handler(pyrogram.handlers.RawUpdateHandler(func, filters), group)
+            elif isinstance(self, Filter) or self is None:
                 if not hasattr(func, "handlers"):
                     func.handlers = []
 
                 func.handlers.append(
                     (
-                        pyrogram.handlers.RawUpdateHandler(func),
-                        group
+                        pyrogram.handlers.RawUpdateHandler(func, self),
+                        group if filters is None else filters
                     )
                 )