Rubka 5.2.0__py3-none-any.whl → 6.4.4__py3-none-any.whl

rubka/api.py

@@ -169,7 +169,326 @@ class Robot:
         """b"""
         if self.get_me()['status'] != "OK":
                 raise InvalidTokenError("The provided bot token is invalid or expired.")
-    
+    def on_message_private(
+        self,
+        chat_id: Optional[Union[str, List[str]]] = None,
+        commands: Optional[List[str]] = None,
+        filters: Optional[Callable[[Message], bool]] = None,
+        sender_id: Optional[Union[str, List[str]]] = None,
+        sender_type: Optional[str] = None,  
+        allow_forwarded: bool = True,
+        allow_files: bool = True,
+        allow_stickers: bool = True,
+        allow_polls: bool = True,
+        allow_contacts: bool = True,
+        allow_locations: bool = True,
+        min_text_length: Optional[int] = None,
+        max_text_length: Optional[int] = None,
+        contains: Optional[str] = None,
+        startswith: Optional[str] = None,
+        endswith: Optional[str] = None,
+        case_sensitive: bool = False
+    ):
+        """
+        Sync decorator for handling only private messages with extended filters.
+        """
+
+        def decorator(func: Callable[[Any, Message], None]):
+            def wrapper(bot, message: Message):
+                
+                if not message.is_private:
+                    return
+
+                
+                if chat_id:
+                    if isinstance(chat_id, str) and message.chat_id != chat_id:
+                        return
+                    if isinstance(chat_id, list) and message.chat_id not in chat_id:
+                        return
+
+                
+                if sender_id:
+                    if isinstance(sender_id, str) and message.sender_id != sender_id:
+                        return
+                    if isinstance(sender_id, list) and message.sender_id not in sender_id:
+                        return
+
+                
+                if sender_type and message.sender_type != sender_type:
+                    return
+
+                
+                if not allow_forwarded and message.forwarded_from:
+                    return
+
+                
+                if not allow_files and message.file:
+                    return
+                if not allow_stickers and message.sticker:
+                    return
+                if not allow_polls and message.poll:
+                    return
+                if not allow_contacts and message.contact_message:
+                    return
+                if not allow_locations and (message.location or message.live_location):
+                    return
+
+                
+                if message.text:
+                    text = message.text if case_sensitive else message.text.lower()
+                    if min_text_length and len(message.text) < min_text_length:
+                        return
+                    if max_text_length and len(message.text) > max_text_length:
+                        return
+                    if contains and (contains if case_sensitive else contains.lower()) not in text:
+                        return
+                    if startswith and not text.startswith(startswith if case_sensitive else startswith.lower()):
+                        return
+                    if endswith and not text.endswith(endswith if case_sensitive else endswith.lower()):
+                        return
+
+                
+                if commands:
+                    if not message.text:
+                        return
+                    parts = message.text.strip().split()
+                    cmd = parts[0].lstrip("/")
+                    if cmd not in commands:
+                        return
+                    message.args = parts[1:]
+
+                
+                if filters and not filters(message):
+                    return
+
+                return func(bot, message)
+
+            self._message_handlers.append({
+                "func": wrapper,
+                "filters": filters,
+                "commands": commands,
+                "chat_id": chat_id,
+                "private_only": True,
+                "sender_id": sender_id,
+                "sender_type": sender_type
+            })
+            return wrapper
+
+        return decorator
+    def on_message_channel(
+        self,
+        chat_id: Optional[Union[str, List[str]]] = None,
+        commands: Optional[List[str]] = None,
+        filters: Optional[Callable[[Message], bool]] = None,
+        sender_id: Optional[Union[str, List[str]]] = None,
+        sender_type: Optional[str] = None,  
+        allow_forwarded: bool = True,
+        allow_files: bool = True,
+        allow_stickers: bool = True,
+        allow_polls: bool = True,
+        allow_contacts: bool = True,
+        allow_locations: bool = True,
+        min_text_length: Optional[int] = None,
+        max_text_length: Optional[int] = None,
+        contains: Optional[str] = None,
+        startswith: Optional[str] = None,
+        endswith: Optional[str] = None,
+        case_sensitive: bool = False
+    ):
+        """
+        Sync decorator for handling only private messages with extended filters.
+        """
+
+        def decorator(func: Callable[[Any, Message], None]):
+            def wrapper(bot, message: Message):
+                
+                if not message.is_channel:
+                    return
+
+                
+                if chat_id:
+                    if isinstance(chat_id, str) and message.chat_id != chat_id:
+                        return
+                    if isinstance(chat_id, list) and message.chat_id not in chat_id:
+                        return
+
+                
+                if sender_id:
+                    if isinstance(sender_id, str) and message.sender_id != sender_id:
+                        return
+                    if isinstance(sender_id, list) and message.sender_id not in sender_id:
+                        return
+
+                
+                if sender_type and message.sender_type != sender_type:
+                    return
+
+                
+                if not allow_forwarded and message.forwarded_from:
+                    return
+
+                
+                if not allow_files and message.file:
+                    return
+                if not allow_stickers and message.sticker:
+                    return
+                if not allow_polls and message.poll:
+                    return
+                if not allow_contacts and message.contact_message:
+                    return
+                if not allow_locations and (message.location or message.live_location):
+                    return
+
+                
+                if message.text:
+                    text = message.text if case_sensitive else message.text.lower()
+                    if min_text_length and len(message.text) < min_text_length:
+                        return
+                    if max_text_length and len(message.text) > max_text_length:
+                        return
+                    if contains and (contains if case_sensitive else contains.lower()) not in text:
+                        return
+                    if startswith and not text.startswith(startswith if case_sensitive else startswith.lower()):
+                        return
+                    if endswith and not text.endswith(endswith if case_sensitive else endswith.lower()):
+                        return
+
+                
+                if commands:
+                    if not message.text:
+                        return
+                    parts = message.text.strip().split()
+                    cmd = parts[0].lstrip("/")
+                    if cmd not in commands:
+                        return
+                    message.args = parts[1:]
+
+                
+                if filters and not filters(message):
+                    return
+
+                return func(bot, message)
+
+            self._message_handlers.append({
+                "func": wrapper,
+                "filters": filters,
+                "commands": commands,
+                "chat_id": chat_id,
+                "private_only": True,
+                "sender_id": sender_id,
+                "sender_type": sender_type
+            })
+            return wrapper
+
+        return decorator
+
+    def on_message_group(
+        self,
+        chat_id: Optional[Union[str, List[str]]] = None,
+        commands: Optional[List[str]] = None,
+        filters: Optional[Callable[[Message], bool]] = None,
+        sender_id: Optional[Union[str, List[str]]] = None,
+        sender_type: Optional[str] = None,  
+        allow_forwarded: bool = True,
+        allow_files: bool = True,
+        allow_stickers: bool = True,
+        allow_polls: bool = True,
+        allow_contacts: bool = True,
+        allow_locations: bool = True,
+        min_text_length: Optional[int] = None,
+        max_text_length: Optional[int] = None,
+        contains: Optional[str] = None,
+        startswith: Optional[str] = None,
+        endswith: Optional[str] = None,
+        case_sensitive: bool = False
+    ):
+        """
+        Sync decorator for handling only group messages with extended filters.
+        """
+
+        def decorator(func: Callable[[Any, Message], None]):
+            def wrapper(bot, message: Message):
+                
+                if not message.is_group:
+                    return
+
+                
+                if chat_id:
+                    if isinstance(chat_id, str) and message.chat_id != chat_id:
+                        return
+                    if isinstance(chat_id, list) and message.chat_id not in chat_id:
+                        return
+
+                
+                if sender_id:
+                    if isinstance(sender_id, str) and message.sender_id != sender_id:
+                        return
+                    if isinstance(sender_id, list) and message.sender_id not in sender_id:
+                        return
+
+                
+                if sender_type and message.sender_type != sender_type:
+                    return
+
+                
+                if not allow_forwarded and message.forwarded_from:
+                    return
+
+                
+                if not allow_files and message.file:
+                    return
+                if not allow_stickers and message.sticker:
+                    return
+                if not allow_polls and message.poll:
+                    return
+                if not allow_contacts and message.contact_message:
+                    return
+                if not allow_locations and (message.location or message.live_location):
+                    return
+
+                
+                if message.text:
+                    text = message.text if case_sensitive else message.text.lower()
+                    if min_text_length and len(message.text) < min_text_length:
+                        return
+                    if max_text_length and len(message.text) > max_text_length:
+                        return
+                    if contains and (contains if case_sensitive else contains.lower()) not in text:
+                        return
+                    if startswith and not text.startswith(startswith if case_sensitive else startswith.lower()):
+                        return
+                    if endswith and not text.endswith(endswith if case_sensitive else endswith.lower()):
+                        return
+
+                
+                if commands:
+                    if not message.text:
+                        return
+                    parts = message.text.strip().split()
+                    cmd = parts[0].lstrip("/")
+                    if cmd not in commands:
+                        return
+                    message.args = parts[1:]
+
+                
+                if filters and not filters(message):
+                    return
+
+                return func(bot, message)
+
+            self._message_handlers.append({
+                "func": wrapper,
+                "filters": filters,
+                "commands": commands,
+                "chat_id": chat_id,
+                "group_only": True,
+                "sender_id": sender_id,
+                "sender_type": sender_type
+            })
+            return wrapper
+
+        return decorator
+
     def on_message(self, filters: Optional[Callable[[Message], bool]] = None, commands: Optional[List[str]] = None):
         def decorator(func: Callable[[Any, Message], None]):
             self._message_handlers.append({
@@ -302,7 +621,7 @@ class Robot:
                         continue
 
                     threading.Thread(target=handler["func"], args=(self, context), daemon=True).start()
-                    return
+                    continue
 
     def get_updates(
         self,
@@ -762,39 +1081,110 @@ class Robot:
         data = response.json()
         return data.get('data', {}).get('file_id')
 
-    def send_button_join(self, chat_id, title_button, username, text, reply_to_message_id=None, id="None"):
+    def send_button_join(
+    self, 
+    chat_id, 
+    title_button :  Union[str, list], 
+    username :  Union[str, list], 
+    text, 
+    reply_to_message_id=None, 
+    id="None"
+):
         from .button import InlineBuilder
-        return self.send_message(
-            chat_id=chat_id,
-            text=text,
-            inline_keypad=InlineBuilder()
-            .row(
-                InlineBuilder()
-                .button_join_channel(
+        builder = InlineBuilder()
+
+        
+        if isinstance(username, (list, tuple)) and isinstance(title_button, (list, tuple)):
+            for t, u in zip(title_button, username):
+                builder = builder.row(
+                    InlineBuilder().button_join_channel(
+                        text=t,
+                        id=id,
+                        username=u
+                    )
+                )
+
+        
+        elif isinstance(username, (list, tuple)) and isinstance(title_button, str):
+            for u in username:
+                builder = builder.row(
+                    InlineBuilder().button_join_channel(
+                        text=title_button,
+                        id=id,
+                        username=u
+                    )
+                )
+
+        
+        else:
+            builder = builder.row(
+                InlineBuilder().button_join_channel(
                     text=title_button,
                     id=id,
                     username=username
                 )
-            ).build(),
-            reply_to_message_id=reply_to_message_id
-        )
-    def send_button_url(self, chat_id, title_button, url, text, reply_to_message_id=None, id="None"):
-        from .button import InlineBuilder
+            )
+
         return self.send_message(
             chat_id=chat_id,
             text=text,
-            inline_keypad=InlineBuilder()
-            .row(
-                InlineBuilder()
-                .button_url_link(
+            inline_keypad=builder.build(),
+            reply_to_message_id=reply_to_message_id
+        )
+
+
+    def send_button_url(
+        self, 
+        chat_id, 
+        title_button :  Union[str, list], 
+        url :  Union[str, list], 
+        text, 
+        reply_to_message_id=None, 
+        id="None"
+    ):
+        from .button import InlineBuilder
+        builder = InlineBuilder()
+
+        
+        if isinstance(url, (list, tuple)) and isinstance(title_button, (list, tuple)):
+            for t, u in zip(title_button, url):
+                builder = builder.row(
+                    InlineBuilder().button_url_link(
+                        text=t,
+                        id=id,
+                        url=u
+                    )
+                )
+
+        
+        elif isinstance(url, (list, tuple)) and isinstance(title_button, str):
+            for u in url:
+                builder = builder.row(
+                    InlineBuilder().button_url_link(
+                        text=title_button,
+                        id=id,
+                        url=u
+                    )
+                )
+
+        
+        else:
+            builder = builder.row(
+                InlineBuilder().button_url_link(
                     text=title_button,
                     id=id,
                     url=url
                 )
-            ).build(),
+            )
+
+        return self.send_message(
+            chat_id=chat_id,
+            text=text,
+            inline_keypad=builder.build(),
             reply_to_message_id=reply_to_message_id
         )
 
+
     def get_upload_url(self, media_type: Literal['File', 'Image', 'Voice', 'Music', 'Gif','Video']) -> str:
         allowed = ['File', 'Image', 'Voice', 'Music', 'Gif','Video']
         if media_type not in allowed: