Merge branch 'raw-updates-swallowing' into develop

pyrogram/client/dispatcher/dispatcher.py

@@ -128,35 +128,35 @@ class Dispatcher:
 
                 parser = self.update_parsers.get(type(update), None)
 
-                if parser is None:
-                    continue
-
-                parsed_update, handler_type = parser(update, users, chats)
+                parsed_update, handler_type = (
+                    parser(update, users, chats)
+                    if parser is not None
+                    else (None, type(None))
+                )
 
                 for group in self.groups.values():
-                    try:
-                        for handler in group:
-                            args = None
+                    for handler in group:
+                        args = None
 
-                            if isinstance(handler, RawUpdateHandler):
-                                args = (update, users, chats)
-                            elif isinstance(handler, handler_type):
-                                if handler.check(parsed_update):
-                                    args = (parsed_update,)
+                        if isinstance(handler, handler_type):
+                            if handler.check(parsed_update):
+                                args = (parsed_update,)
+                        elif isinstance(handler, RawUpdateHandler):
+                            args = (update, users, chats)
 
-                            if args is None:
-                                continue
+                        if args is None:
+                            continue
 
-                            try:
-                                handler.callback(self.client, *args)
-                            except StopIteration:
-                                raise
-                            except Exception as e:
-                                log.error(e, exc_info=True)
+                        try:
+                            handler.callback(self.client, *args)
+                        except pyrogram.StopPropagation:
+                            raise
+                        except Exception as e:
+                            log.error(e, exc_info=True)
 
-                            break
-                    except StopIteration:
                         break
+            except pyrogram.StopPropagation:
+                pass
             except Exception as e:
                 log.error(e, exc_info=True)
 

pyrogram/client/handlers/callback_query_handler.py

@@ -45,10 +45,3 @@ class CallbackQueryHandler(Handler):
 
     def __init__(self, callback: callable, filters=None):
         super().__init__(callback, filters)
-
-    def check(self, callback_query):
-        return (
-            self.filters(callback_query)
-            if callable(self.filters)
-            else True
-        )

pyrogram/client/handlers/deleted_messages_handler.py

@@ -48,8 +48,4 @@ class DeletedMessagesHandler(Handler):
         super().__init__(callback, filters)
 
     def check(self, messages):
-        return (
-            self.filters(messages.messages[0])
-            if callable(self.filters)
-            else True
-        )
+        return super().check(messages.messages[0])

pyrogram/client/handlers/handler.py

@@ -21,3 +21,10 @@ class Handler:
     def __init__(self, callback: callable, filters=None):
         self.callback = callback
         self.filters = filters
+
+    def check(self, update):
+        return (
+            self.filters(update)
+            if callable(self.filters)
+            else True
+        )

pyrogram/client/handlers/message_handler.py

@@ -46,10 +46,3 @@ class MessageHandler(Handler):
 
     def __init__(self, callback: callable, filters=None):
         super().__init__(callback, filters)
-
-    def check(self, message):
-        return (
-            self.filters(message)
-            if callable(self.filters)
-            else True
-        )

pyrogram/client/handlers/user_status_handler.py

@@ -45,10 +45,3 @@ class UserStatusHandler(Handler):
 
     def __init__(self, callback: callable, filters=None):
         super().__init__(callback, filters)
-
-    def check(self, user_status):
-        return (
-            self.filters(user_status)
-            if callable(self.filters)
-            else True
-        )