Allow decorators in plugins to be stacked (#642)

This allows registering the same callback function more than once by using different handlers.

pyrogram/client.py

@@ -717,8 +717,7 @@ class Client(Methods, Scaffold):
                     for name in vars(module).keys():
                         # noinspection PyBroadException
                         try:
-                            handler, group = getattr(module, name).handler
-
+                            for handler, group in getattr(module, name).handlers:
                                 if isinstance(handler, Handler) and isinstance(group, int):
                                     self.add_handler(handler, group)
 

pyrogram/methods/decorators/on_callback_query.py

@@ -47,10 +47,15 @@ class OnCallbackQuery(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.CallbackQueryHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.CallbackQueryHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_chosen_inline_result.py

@@ -47,10 +47,15 @@ class OnChosenInlineResult(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.ChosenInlineResultHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.ChosenInlineResultHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_deleted_messages.py

@@ -47,10 +47,15 @@ class OnDeletedMessages(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.DeletedMessagesHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.DeletedMessagesHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_inline_query.py

@@ -47,10 +47,15 @@ class OnInlineQuery(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.InlineQueryHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.InlineQueryHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_message.py

@@ -47,10 +47,15 @@ class OnMessage(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.MessageHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.MessageHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_poll.py

@@ -47,10 +47,15 @@ class OnPoll(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.PollHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.PollHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_raw_update.py

@@ -41,10 +41,15 @@ class OnRawUpdate(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.RawUpdateHandler(func), group)
             else:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.RawUpdateHandler(func),
                         group if self is None else group
                     )
+                )
 
             return func
 

pyrogram/methods/decorators/on_user_status.py

@@ -45,10 +45,15 @@ class OnUserStatus(Scaffold):
             if isinstance(self, pyrogram.Client):
                 self.add_handler(pyrogram.handlers.UserStatusHandler(func, filters), group)
             elif isinstance(self, Filter) or self is None:
-                func.handler = (
+                if not hasattr(func, "handlers"):
+                    func.handlers = []
+
+                func.handlers.append(
+                    (
                         pyrogram.handlers.UserStatusHandler(func, self),
                         group if filters is None else filters
                     )
+                )
 
             return func