Allow decorators to be stacked

delivrance · delivrance · commit 2e164993693f · 2018-11-10T15:21:52.000+01:00
E.g:

app1.on_message(...)
app2.on_message(...)
app3.on_message(...)
def on_message(client, message):
    ...
diff --git a/pyrogram/client/methods/decorators/on_callback_query.py b/pyrogram/client/methods/decorators/on_callback_query.py
@@ -37,6 +37,9 @@ def on_callback_query(self=None, filters=None, group: int = 0):
         """
 
         def decorator(func):
+            if isinstance(func, tuple):
+                func = func[0].callback
+
             handler = pyrogram.CallbackQueryHandler(func, filters)
 
             if isinstance(self, Filter):
diff --git a/pyrogram/client/methods/decorators/on_deleted_messages.py b/pyrogram/client/methods/decorators/on_deleted_messages.py
@@ -37,6 +37,9 @@ def on_deleted_messages(self=None, filters=None, group: int = 0):
         """
 
         def decorator(func):
+            if isinstance(func, tuple):
+                func = func[0].callback
+
             handler = pyrogram.DeletedMessagesHandler(func, filters)
 
             if isinstance(self, Filter):
diff --git a/pyrogram/client/methods/decorators/on_message.py b/pyrogram/client/methods/decorators/on_message.py
@@ -37,6 +37,9 @@ def on_message(self=None, filters=None, group: int = 0):
         """
 
         def decorator(func):
+            if isinstance(func, tuple):
+                func = func[0].callback
+
             handler = pyrogram.MessageHandler(func, filters)
 
             if isinstance(self, Filter):
diff --git a/pyrogram/client/methods/decorators/on_raw_update.py b/pyrogram/client/methods/decorators/on_raw_update.py
@@ -32,6 +32,9 @@ def on_raw_update(self=None, group: int = 0):
         """
 
         def decorator(func):
+            if isinstance(func, tuple):
+                func = func[0].callback
+
             handler = pyrogram.RawUpdateHandler(func)
 
             if isinstance(self, int):
diff --git a/pyrogram/client/methods/decorators/on_user_status.py b/pyrogram/client/methods/decorators/on_user_status.py
@@ -36,6 +36,9 @@ def on_user_status(self=None, filters=None, group: int = 0):
         """
 
         def decorator(func):
+            if isinstance(func, tuple):
+                func = func[0].callback
+
             handler = pyrogram.UserStatusHandler(func, filters)
 
             if isinstance(self, Filter):
