Rubka 3.3.4__tar.gz → 4.3.4__tar.gz

{rubka-3.3.4 → rubka-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 3.3.4
+Version: 4.3.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 → rubka-4.3.4}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 3.3.4
+Version: 4.3.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 → rubka-4.3.4}/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()
 
 
 

{rubka-3.3.4 → rubka-4.3.4}/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 → rubka-4.3.4}/setup.py

@@ -8,7 +8,7 @@ except FileNotFoundError:
 
 setup(
     name='Rubka',
-    version='3.3.4',
+    version='4.3.4',
     description='A Python library for interacting with Rubika Bot API.',
     long_description=long_description,
     long_description_content_type='text/markdown',