Rubka 3.3.4__py3-none-any.whl → 4.4.4__py3-none-any.whl

rubka/api.py

@@ -73,6 +73,8 @@ class Robot:
         self._callback_handler = None
         self._message_handler = None
         self._inline_query_handler = None
+        self._callback_handlers = None
+        self._callback_handlers = []  # ✅ این خط مهمه
 
 
         logger.info(f"Initialized RubikaBot with token: {token[:8]}***")
@@ -108,7 +110,16 @@ class Robot:
             return func
         return decorator
 
-
+    def on_callback(self, button_id: Optional[str] = None):
+        def decorator(func: Callable[[Any, Message], None]):
+            if not hasattr(self, "_callback_handlers"):
+                self._callback_handlers = []
+            self._callback_handlers.append({
+                "func": func,
+                "button_id": button_id
+            })
+            return func
+        return decorator
     def on_inline_query(self):
         def decorator(func: Callable[[Any, InlineMessage], None]):
             self._inline_query_handler = func
@@ -116,12 +127,14 @@ class Robot:
         return decorator
     
     def _process_update(self, update: Dict[str, Any]):
-        import threading
+        import threading, time
+
         if update.get('type') == 'ReceiveQuery':
             msg = update.get("inline_message", {})
             if self._inline_query_handler:
                 context = InlineMessage(bot=self, raw_data=msg)
                 threading.Thread(target=self._inline_query_handler, args=(self, context), daemon=True).start()
+            return  # اگر inline بود ادامه نده
 
         if update.get('type') == 'NewMessage':
             msg = update.get('new_message', {})
@@ -129,16 +142,27 @@ class Robot:
             message_id = msg.get('message_id')
             sender_id = msg.get('sender_id')
             text = msg.get('text')
+
+            # فیلتر زمان قدیمی
             try:
-                import time
                 if msg.get("time") and (time.time() - float(msg["time"])) > 20:
                     return
             except Exception:
                 return
 
+            # ساخت context یکجا
+            context = Message(bot=self, chat_id=chat_id, message_id=message_id, sender_id=sender_id, text=text, raw_data=msg)
+
+            # 💠 اول بررسی دکمه‌ها (callback)
+            if context.aux_data and hasattr(self, "_callback_handlers"):
+                for handler in self._callback_handlers:
+                    if not handler["button_id"] or context.aux_data.button_id == handler["button_id"]:
+                        threading.Thread(target=handler["func"], args=(self, context), daemon=True).start()
+                        return  # فقط اولین callback اجرا شود
+
+            # 💠 بعد بررسی پیام‌های متنی معمولی
             if self._message_handler:
                 handler = self._message_handler
-                context = Message(bot=self, chat_id=chat_id, message_id=message_id, sender_id=sender_id, text=text, raw_data=msg)
 
                 if handler["commands"]:
                     if not context.text or not context.text.startswith("/"):
@@ -149,22 +173,11 @@ class Robot:
                         return
                     context.args = parts[1:]
 
-                if handler["filters"]:
-                    if not handler["filters"](context):
-                        return
+                if handler["filters"] and not handler["filters"](context):
+                    return
 
                 threading.Thread(target=handler["func"], args=(self, context), daemon=True).start()
 
-        elif update.get('type') == 'ReceiveQuery':
-            msg = update.get("inline_message", {})
-            chat_id = msg.get("chat_id")
-            message_id = msg.get("message_id")
-            sender_id = msg.get("sender_id")
-            text = msg.get("text")
-
-            if hasattr(self, "_callback_handler"):
-                context = Message(bot=self, chat_id=chat_id, message_id=message_id, sender_id=sender_id, text=text, raw_data=msg)
-                threading.Thread(target=self._callback_handler, args=(self, context), daemon=True).start()
 
 
 
@@ -225,7 +238,9 @@ class Robot:
     def _get_client(self):
         return Client_get(show_last_six_words(self.token))
 
-    def check_join(self, channel_guid: str, chat_id: str = None) -> bool | list[str]:
+    from typing import Union
+
+    def check_join(self, channel_guid: str, chat_id: str = None) -> Union[bool, list[str]]:
         client = self._get_client()
 
         if chat_id:

rubka/context.py

@@ -195,7 +195,6 @@ class Message:
         self.time: str = self.raw_data.get("time")
         self.is_edited: bool = self.raw_data.get("is_edited", False)
         self.sender_type: str = self.raw_data.get("sender_type")
-
         self.args = []
         self.reply_to_message_id: Optional[str] = self.raw_data.get("reply_to_message_id")
         self.forwarded_from = ForwardedFrom(self.raw_data["forwarded_from"]) if "forwarded_from" in self.raw_data else None

{rubka-3.3.4.dist-info → rubka-4.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 3.3.4
+Version: 4.4.4
 Summary: A Python library for interacting with Rubika Bot API.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/Rubka/archive/refs/tags/v0.1.0.tar.gz

{rubka-3.3.4.dist-info → rubka-4.4.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 rubka/__init__.py,sha256=3f4H6Uj1ylrfBYlTHmTvzZSvaPJsdNhCocyX3Bbvuv0,254
-rubka/api.py,sha256=C1LImvk-0SWhU8g1Lhs_9h-gD_mbWVAjNuZoCQ9duhg,15489
+rubka/api.py,sha256=ltEMTWP0YbsOeRmIdgCxKhDMjdldl4hr5FJxa7ThP_k,16142
 rubka/button.py,sha256=4fMSZR7vUADxSmw1R3_pZ4dw5uMLZX5sOkwPPyNTBDE,8437
 rubka/config.py,sha256=Bck59xkOiqioLv0GkQ1qPGnBXVctz1hKk6LT4h2EPx0,78
-rubka/context.py,sha256=5OMFjcnMWvkn3ZigRgJrjMiFt_tYgMwzHsTS6qXMGj8,12843
+rubka/context.py,sha256=BSb_O1PiB0QEPeY_u2F97oIVxg-3J9Re2iV1HWywz4M,12841
 rubka/decorators.py,sha256=hGwUoE4q2ImrunJIGJ_kzGYYxQf1ueE0isadqraKEts,1157
 rubka/exceptions.py,sha256=tujZt1XrhWaw-lmdeVadVceUptpw4XzNgE44sAAY0gs,90
 rubka/jobs.py,sha256=GvLMLsVhcSEzRTgkvnPISPEBN71suW2xXI0hUaUZPTo,378
@@ -31,7 +31,7 @@ rubka/adaptorrubka/types/socket/message.py,sha256=0WgLMZh4eow8Zn7AiSX4C3GZjQTkIg
 rubka/adaptorrubka/utils/__init__.py,sha256=OgCFkXdNFh379quNwIVOAWY2NP5cIOxU5gDRRALTk4o,54
 rubka/adaptorrubka/utils/configs.py,sha256=nMUEOJh1NqDJsf9W9PurkN_DLYjO6kKPMm923i4Jj_A,492
 rubka/adaptorrubka/utils/utils.py,sha256=5-LioLNYX_TIbQGDeT50j7Sg9nAWH2LJUUs-iEXpsUY,8816
-rubka-3.3.4.dist-info/METADATA,sha256=tN6zlYf45FxI_wpHNI7IITcOs0CRZPTR5fNdiyXYIpY,8168
-rubka-3.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubka-3.3.4.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
-rubka-3.3.4.dist-info/RECORD,,
+rubka-4.4.4.dist-info/METADATA,sha256=UhBp299rDrFsmyEw42UnzBNhencqkvUqOgWSfTi5CEc,8168
+rubka-4.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubka-4.4.4.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
+rubka-4.4.4.dist-info/RECORD,,