Rubka 7.1.17__tar.gz → 7.2.1__tar.gz

{rubka-7.1.17 → rubka-7.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.17
+Version: 7.2.1
 Summary: Rubika: A Python library for interacting with the Rubika Bot API. This library provides an easy-to-use interface to send messages, polls, stickers, media files, manage groups and channels, handle inline keyboards, and implement advanced bot features like subscription management, user authentication, and message handling. Ideal for developers looking to automate and extend their Rubika bots with Python.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/rubka/archive/refs/tags/v6.6.4.zip

{rubka-7.1.17 → rubka-7.2.1}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.17
+Version: 7.2.1
 Summary: Rubika: A Python library for interacting with the Rubika Bot API. This library provides an easy-to-use interface to send messages, polls, stickers, media files, manage groups and channels, handle inline keyboards, and implement advanced bot features like subscription management, user authentication, and message handling. Ideal for developers looking to automate and extend their Rubika bots with Python.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/rubka/archive/refs/tags/v6.6.4.zip

{rubka-7.1.17 → rubka-7.2.1}/rubka/asynco.py

@@ -280,6 +280,7 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         self.proxy = proxy
         self.max_msg_age = max_msg_age
         self.retries = retries
+        self.middleware_data = []
         
         self.retry_delay = retry_delay
         self.raise_errors = raise_errors
@@ -346,7 +347,6 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
     async def _post(self, method: str, data: Dict[str, Any]) -> Dict[str, Any]:
         base_url = BASE_URLS[self.api_endpoint]
         url = f"{base_url}/{self.token}/{method}"
-        print(url)
         session = await self._get_session()
         for attempt in range(1, self.retries + 1):
             try:
@@ -542,6 +542,11 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
 
 #decorator#
 
+    def middleware(self):
+        def decorator(func: Callable[[Any, Union[Message, InlineMessage]], None]):
+            self.middleware_data.append(func)
+            return func
+        return decorator
     def on_message_private(
         self,
         chat_id: Optional[Union[str, List[str]]] = None,   
@@ -1843,20 +1848,23 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         reply_to_message_id: Optional[str] = None,
         chat_keypad_type: Optional[Literal["New", "Remove"]] = None,
         delete_after: Optional[int] = None,
-        parse_mode: Optional[Literal["HTML", "Markdown"]] = None
+        parse_mode: Optional[Literal["HTML", "Markdown"]] = None,
+        meta_data:Optional[dict] = None
     ) -> Dict[str, Any]:
-
         payload = {
             "chat_id": chat_id,
             "text": text,
             "disable_notification": disable_notification,
         }
-        parse_mode_to_use = parse_mode or self.parse_mode
-        if text:
-            text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
-            payload["text"] = text
-            if metadata:
-                payload["metadata"] = metadata
+        if not meta_data:
+            parse_mode_to_use = parse_mode or self.parse_mode
+            if text:
+                text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
+                payload["text"] = text
+                if metadata:
+                    payload["metadata"] = metadata
+        else :
+            payload["metadata"] = meta_data
         if chat_keypad:
             payload["chat_keypad"] = chat_keypad
             payload["chat_keypad_type"] = chat_keypad_type or "New"
@@ -2143,16 +2151,20 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             raise ValueError(f"Invalid media type. Must be one of {allowed}")
         result = await self._post("requestSendFile", {"type": media_type})
         return result.get("data", {}).get("upload_url")
-    async def _send_uploaded_file(self, chat_id: str, file_id: str,type_file : str = "file",text: Optional[str] = None, chat_keypad: Optional[Dict[str, Any]] = None, inline_keypad: Optional[Dict[str, Any]] = None, disable_notification: bool = False, reply_to_message_id: Optional[str] = None, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
+    async def _send_uploaded_file(self, chat_id: str, file_id: str,type_file : str = "file",text: Optional[str] = None, chat_keypad: Optional[Dict[str, Any]] = None, inline_keypad: Optional[Dict[str, Any]] = None, disable_notification: bool = False, reply_to_message_id: Optional[str] = None, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
         payload = {"chat_id": chat_id, "file_id": file_id, "text": text, "disable_notification": disable_notification, "chat_keypad_type": chat_keypad_type}
         if chat_keypad: payload["chat_keypad"] = chat_keypad
         if inline_keypad: payload["inline_keypad"] = inline_keypad
         if reply_to_message_id: payload["reply_to_message_id"] = str(reply_to_message_id)
-        parse_mode_to_use = parse_mode or self.parse_mode
-        if text:
-            text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
-            payload["text"] = text
-            if metadata:payload["metadata"] = metadata
+        if not meta_data:
+            parse_mode_to_use = parse_mode or self.parse_mode
+            if text:
+                text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
+                payload["text"] = text
+                if metadata:
+                    payload["metadata"] = metadata
+        else :
+            payload["metadata"] = meta_data
         payload["time"] = "10"
         resp = await self._post("sendFile", payload)
         message_id_put = resp["data"]["message_id"]
@@ -2172,26 +2184,26 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             "chat_keypad_type":chat_keypad_type
         }
         return AttrDict(result)
-    async def _send_file_generic(self, media_type, chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode: Optional[Literal["HTML", "Markdown"]] = None):
+    async def _send_file_generic(self, media_type, chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None):
         if path:
             file_name = file_name or Path(path).name
             upload_url = await self.get_upload_url(media_type)
             file_id = await self.upload_media_file(upload_url, file_name, path)
         if not file_id:
             raise ValueError("Either path or file_id must be provided.")
-        return await self._send_uploaded_file(chat_id=chat_id, file_id=file_id, text=text, inline_keypad=inline_keypad, chat_keypad=chat_keypad, reply_to_message_id=reply_to_message_id, disable_notification=disable_notification, chat_keypad_type=chat_keypad_type,type_file=media_type,parse_mode=parse_mode)
-    async def send_document(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("File", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)
-    async def send_file(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, caption: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)
-    async def re_send(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, caption: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)  
-    async def send_video(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("Video", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)
-    async def send_voice(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("voice", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)
-    async def send_image(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
-        return await self._send_file_generic("Image", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode)
+        return await self._send_uploaded_file(chat_id=chat_id, file_id=file_id, text=text, inline_keypad=inline_keypad, chat_keypad=chat_keypad, reply_to_message_id=reply_to_message_id, disable_notification=disable_notification, chat_keypad_type=chat_keypad_type,type_file=media_type,parse_mode=parse_mode,meta_data=meta_data)
+    async def send_document(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("File", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)
+    async def send_file(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, caption: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)
+    async def re_send(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, caption: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)  
+    async def send_video(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("Video", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)
+    async def send_voice(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("voice", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)
+    async def send_image(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
+        return await self._send_file_generic("Image", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type,parse_mode=parse_mode,meta_data=meta_data)
     async def send_music(
     self,
     chat_id: str,
@@ -2204,7 +2216,8 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
     reply_to_message_id: Optional[str] = None,
     disable_notification: bool = False,
     chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",
-    parse_mode: Optional[Literal["HTML", "Markdown"]] = None
+    parse_mode: Optional[Literal["HTML", "Markdown"]] = None,
+    meta_data:Optional[dict] = None
     ) -> Dict[str, Any]:
         valid_extensions = {"ogg", "oga", "opus", "flac"}
         extension = "flac"
@@ -2237,7 +2250,8 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             reply_to_message_id,
             disable_notification,
             chat_keypad_type,
-            parse_mode=parse_mode
+            parse_mode=parse_mode,
+            meta_data=meta_data
         )
     async def send_gif(
     self,
@@ -2251,7 +2265,8 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
     reply_to_message_id: Optional[str] = None,
     disable_notification: bool = False,
     chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = "None",
-    parse_mode: Optional[Literal["HTML", "Markdown"]] = None
+    parse_mode: Optional[Literal["HTML", "Markdown"]] = None,
+    meta_data:Optional[dict] = None
     ) -> Dict[str, Any]:
         valid_extensions = {"gif"}
         extension = "gif"
@@ -2284,7 +2299,7 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             reply_to_message_id,
             disable_notification,
             chat_keypad_type,
-            parse_mode=parse_mode
+            parse_mode=parse_mode,meta_data=meta_data
         )
 
     async def get_avatar_me(self, save_as: str = None) -> str:
@@ -2428,18 +2443,21 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         return await self._post("leaveChat", {"chat_id": chat_id})
     async def forward_message(self, from_chat_id: str, message_id: str, to_chat_id: str, disable_notification: bool = False) -> Dict[str, Any]:
         return await self._post("forwardMessage", {"from_chat_id": from_chat_id, "message_id": message_id, "to_chat_id": to_chat_id, "disable_notification": disable_notification})
-    async def edit_message_text(self, chat_id: str, message_id: str, text: str, parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
+    async def edit_message_text(self, chat_id: str, message_id: str, text: str, parse_mode: Optional[Literal["HTML", "Markdown"]] = None,meta_data:Optional[dict] = None) -> Dict[str, Any]:
         payload = {
             "chat_id": chat_id,
             "message_id": message_id,
             "text": text,
         }
-        parse_mode_to_use = parse_mode or self.parse_mode
-        if text:
-            text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
-            payload["text"] = text
-            if metadata:
-                payload["metadata"] = metadata
+        if not meta_data:
+            parse_mode_to_use = parse_mode or self.parse_mode
+            if text:
+                text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
+                payload["text"] = text
+                if metadata:
+                    payload["metadata"] = metadata
+        else :
+            payload["metadata"] = meta_data
         return await self._post("editMessageText", payload)
     async def edit_inline_keypad(self,chat_id: str,message_id: str,inline_keypad: Dict[str, Any],text: str = None) -> Dict[str, Any]:
         if text is not None:await self._post("editMessageText", {"chat_id": chat_id,"message_id": message_id,"text": text})

{rubka-7.1.17 → rubka-7.2.1}/rubka/context.py

@@ -288,6 +288,7 @@ class Message:
         self.is_audio = None
         self.is_voice = None
         self.is_document = None
+        self.is_music = None
         self.is_archive = None
         self.is_executable = None
         self.is_font = None
@@ -356,6 +357,7 @@ class Message:
             self.is_photo = name.endswith((".jpg", ".jpeg", ".png", ".gif", ".webp"))
             self.is_video = name.endswith((".mp4", ".mov", ".avi", ".mkv", ".webm"))
             self.is_audio = name.endswith((".mp3", ".wav", ".ogg", ".m4a", ".flac"))
+            self.is_music = name.endswith((".mp3", ".wav", ".ogg", ".m4a", ".flac"))
             self.is_voice = name.endswith((".ogg", ".m4a"))
             self.is_document = name.endswith((".pdf", ".doc", ".docx", ".txt", ".xls", ".xlsx", ".ppt", ".pptx"))
             self.is_archive = name.endswith((".zip", ".rar", ".7z", ".tar", ".gz"))
@@ -437,8 +439,32 @@ class Message:
             reply_to_message_id=self.message_id,
             **kwargs
         )
-    
-
+    async def copy(self, to_chat_id: Optional[str], message_id: Optional[str] = None):await self.copy_message(to_chat_id, message_id)
+    async def copy_message(self, to_chat_id: Optional[str], message_id: Optional[str] = None):
+        try:
+            send_func = None
+            kwargs = {
+                "chat_id": to_chat_id,
+                "reply_to_message_id": message_id,
+                "meta_data": self.metadata
+            }
+            if getattr(self, "is_photo", False):
+                send_func = self.bot.send_image
+            elif getattr(self, "is_video", False):
+                send_func = self.bot.send_video
+            elif getattr(self, "is_document", False):
+                send_func = self.bot.send_document
+            elif getattr(self, "is_text", False):
+                send_func = self.bot.send_message
+                kwargs["text"] = self.text
+            if send_func:
+                if hasattr(self, "file") and self.file:
+                    kwargs["path"] = await self.bot.get_url_file(self.file.file_id)
+                return await send_func(**kwargs)
+            else:
+                raise Exception("Unsupported message type.")
+        except Exception as e:
+            raise Exception(f"Error: {e}")
     def reply_poll(
         self,
         question: str,

{rubka-7.1.17 → rubka-7.2.1}/rubka/filters.py

@@ -244,9 +244,10 @@ def chat_title_equals(value: str):
     
     return Filter(lambda m: getattr(m, "chat", None) and getattr(m.chat, "title", "") == value)
 
-def chat_id_is(cid: str):
-    return Filter(lambda m: getattr(m, "chat", None) and getattr(m.chat, "id", None) == cid)
-
+def chat_id_is(sender_id: str):
+    return Filter(lambda m: getattr(m, "chat_id", None) == sender_id)
+def sender_id_is(sender_id: str):
+    return Filter(lambda m: getattr(m, "sender_id", None) == sender_id)
 def chat_member_count(min_count: int = 0, max_count: int = None):
     
     def _filter(m):

{rubka-7.1.17 → rubka-7.2.1}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setup(
     name='Rubka',
-    version='7.1.17',
+    version='7.2.1',
     description=(
     "Rubika: A Python library for interacting with the Rubika Bot API. "
     "This library provides an easy-to-use interface to send messages, polls, "