Rubka 7.1.8__tar.gz → 7.1.10__tar.gz

{rubka-7.1.8 → rubka-7.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.8
+Version: 7.1.10
 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
@@ -27,7 +27,6 @@ Classifier: Natural Language :: Persian
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: requests
-Requires-Dist: Pillow
 Requires-Dist: websocket-client
 Requires-Dist: pycryptodome
 Requires-Dist: aiohttp

{rubka-7.1.8 → rubka-7.1.10}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.8
+Version: 7.1.10
 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
@@ -27,7 +27,6 @@ Classifier: Natural Language :: Persian
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: requests
-Requires-Dist: Pillow
 Requires-Dist: websocket-client
 Requires-Dist: pycryptodome
 Requires-Dist: aiohttp

{rubka-7.1.8 → rubka-7.1.10}/Rubka.egg-info/requires.txt

@@ -1,5 +1,4 @@
 requests
-Pillow
 websocket-client
 pycryptodome
 aiohttp

rubka-7.1.8/rubka/update.py → rubka-7.1.10/rubka/context.py

@@ -1,8 +1,68 @@
-from typing import Any, Dict, List,Optional
 from typing import Union
 from pathlib import Path
+from typing import List, Optional, Dict, Any, Literal, Callable, Union,Set
 import re,inspect
 import asyncio
+_EMOJI_PATTERN = re.compile(
+    "["
+    "\U0001F300-\U0001F5FF"
+    "\U0001F600-\U0001F64F"
+    "\U0001F680-\U0001F6FF"
+    "\U0001F700-\U0001F77F"
+    "\U0001F780-\U0001F7FF"
+    "\U0001F800-\U0001F8FF"
+    "\U0001F900-\U0001F9FF"
+    "\U0001FA00-\U0001FA6F"
+    "\U0001FA70-\U0001FAFF"
+    "\U00002700-\U000027BF"
+    "\U00002600-\U000026FF"
+    "\U00002000-\U000023FF" 
+    "]+", 
+    flags=re.UNICODE
+)
+
+def contains_emoji(text: str) -> bool:
+    if not text:return False
+    return bool(_EMOJI_PATTERN.search(text))
+
+def count_emojis(text: str) -> int:
+    if not text:return 0
+    return len(_EMOJI_PATTERN.findall(text))
+def contains_link_or_mention(text: str) -> bool:
+    if not text:return False
+    pattern = re.compile(
+        r"(?i)\b("
+        r"https?://[^\s]+"
+        r"|www\.[^\s]+"
+        r"|[a-zA-Z0-9.-]+\.(com|net|org|ir|edu|gov|info|biz|io|me|co|xyz|in|us|uk|ru|tv|cc|app|dev|site|store|cloud|shop)"
+        r"|t\.me/[^\s]+"
+        r"|telegram\.me/[^\s]+"
+        r"|rubika\.(ir|app)/[^\s]+"
+        r"|whatsapp\.com/[^\s]+"
+        r"|wa\.me/[^\s]+"
+        r"|instagram\.com/[^\s]+"
+        r"|instagr\.am/[^\s]+"
+        r"|youtube\.com/[^\s]+"
+        r"|youtu\.be/[^\s]+"
+        r"|aparat\.com/[^\s]+"
+        r"|discord\.gg/[^\s]+"
+        r"|discord\.com/[^\s]+"
+        r"|splus\.ir/[^\s]+"
+        r"|eitaa\.com/[^\s]+"
+        r"|ble\.ir/[^\s]+"
+        r"|gap\.im/[^\s]+"
+        r"|rubino\.ir/[^\s]+"
+        r"|pin\.it/[^\s]+"
+        r"|twitter\.com/[^\s]+"
+        r"|x\.com/[^\s]+"
+        r"|facebook\.com/[^\s]+"
+        r"|threads\.net/[^\s]+"
+        r"|@\w+"
+        r"|\b\d{1,3}(?:\.\d{1,3}){3}\b" 
+        r"|\[?[A-F0-9:]{2,39}\]?"
+        r")\b"
+    )
+    return bool(pattern.search(text))
 class File:
     def __init__(self, data: dict):
         self.file_id: str = data.get("file_id")
@@ -215,10 +275,52 @@ class Message:
         self.author_guid  = self.raw_data.get("sender_id", sender_id)
         self.message_id: str = self.raw_data.get("message_id", message_id)
         self.text: str = self.raw_data.get("text", text)
-        self.has_link = bool(re.search(
-    r"(https?://[^\s]+|www\.[^\s]+|[a-zA-Z0-9.-]+\.(com|net|org|ir|edu|gov|info|biz|io|me|co)|t\.me/[^\s]+|telegram\.me/[^\s]+|@\w+|\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b)",
-    self.raw_data.get("text", text) or ""
-))
+        self.has_link = contains_link_or_mention(self.raw_data.get("text", text))
+        self.is_link = self.has_link
+        self.is_mention = bool(re.search(r"@\w+", self.raw_data.get("text", text) or ""))
+        self.is_hashtag = bool(re.search(r"#\w+", text or ""))
+        self.is_number = bool(re.search(r"\d+", text or ""))
+        self.is_emoji = contains_emoji(self.raw_data.get("text", text))
+        self.emoji_count = count_emojis(self.raw_data.get("text", text))
+        self.is_pure_emoji = bool(self.is_emoji and self.emoji_count == len(self.text))
+        self.is_photo = None
+        self.is_video = None
+        self.is_audio = None
+        self.is_voice = None
+        self.is_document = None
+        self.is_archive = None
+        self.is_executable = None
+        self.is_font = None
+        self.metadata = self.raw_data.get("metadata", {})
+        self.is_metadata = self.metadata
+        self.meta_parts = self.metadata.get("meta_data_parts", [])
+        self.has_metadata = bool(self.meta_parts)
+        self.meta_types = [part.get("type") for part in self.meta_parts] if self.has_metadata else []
+        self.is_bold = "Bold" in self.meta_types
+        self.is_italic = "Italic" in self.meta_types
+        self.is_strike = "Strike" in self.meta_types
+        self.is_underline = "Underline" in self.meta_types
+        self.is_quote = "Quote" in self.meta_types
+        self.is_spoiler = "Spoiler" in self.meta_types
+        self.is_pre = "Pre" in self.meta_types
+        self.is_mono = "Mono" in self.meta_types
+        self.is_link_meta = "Link" in self.meta_types
+        self.meta_links = [part.get("link_url") for part in self.meta_parts if part.get("type") == "Link"]
+        self.meta_link_positions = [
+            {"from": part.get("from_index"), "length": part.get("length"), "url": part.get("link_url")}
+            for part in self.meta_parts if part.get("type") == "Link"
+        ]
+        self.has_link = contains_link_or_mention(self.text) or self.is_link_meta
+        self.is_formatted = any([
+            self.is_bold,
+            self.is_italic,
+            self.is_strike,
+            self.is_underline,
+            self.is_quote,
+            self.is_spoiler,
+            self.is_pre,
+            self.is_mono
+        ])
         self.sender_id: str = self.raw_data.get("sender_id", sender_id)
         self.time: str = self.raw_data.get("time")
         self.is_edited: bool = self.raw_data.get("is_edited", False)
@@ -336,14 +438,40 @@ class Message:
         )
     
 
-    def reply_poll(self, question: str, options: List[str], **kwargs) -> Dict[str, Any]:
-        return self.bot._post("sendPoll", {
+    def reply_poll(
+        self,
+        question: str,
+        options: List[str],
+        type: Literal['Regular', 'Quiz'] = "Regular",
+        allows_multiple_answers: bool = False,
+        is_anonymous: bool = True,
+        correct_option_index: Optional[int] = None,
+        hint: Optional[str] = None,
+        reply_to_message_id: Optional[str] = None,
+        disable_notification: bool = False,
+        show_results: bool = False,
+        inline_keypad: Optional[Dict[str, Any]] = None,
+        chat_keypad: Optional[Dict[str, Any]] = None,
+        chat_keypad_type: Optional[Literal['New', 'Remove', 'None']] = None,
+        **kwargs
+    ) -> dict:
+        payload = {
             "chat_id": self.chat_id,
             "question": question,
             "options": options,
-            "reply_to_message_id": self.message_id,
-            **kwargs
-        })
+            "type": type,
+            "allows_multiple_answers": allows_multiple_answers,
+            "is_anonymous": is_anonymous,
+            "correct_option_index": correct_option_index,
+            "hint": hint,
+            "reply_to_message_id": self.message_id if not reply_to_message_id else reply_to_message_id,
+            "disable_notification": disable_notification,
+            "show_results": show_results,
+            "inline_keypad": inline_keypad,
+            "chat_keypad": chat_keypad,
+            "chat_keypad_type": chat_keypad_type,
+        }
+        return self.bot._post("sendPoll", {key: value for key, value in payload.items() if value is not None}, **kwargs)
     
 
     def reply_document(
@@ -617,13 +745,69 @@ class InlineMessage:
         if self.chat_id not in self.bot.sessions:
             self.bot.sessions[self.chat_id] = {}
         return self.bot.sessions[self.chat_id]
-    def reply(self, text: str, **kwargs):
-        return self.bot.send_message(
-            self.chat_id,
-            text,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
+    
+    def reply(self, text: str, delete_after: int = None, **kwargs):
+        async def _reply_async():
+            send_func = self.bot.send_message
+            if inspect.iscoroutinefunction(send_func):
+                msg = await send_func(
+                    self.chat_id,
+                    text,
+                    reply_to_message_id=self.message_id,
+                    delete_after=delete_after,
+                    **kwargs
+                )
+            else:
+                msg = send_func(
+                    self.chat_id,
+                    text,
+                    reply_to_message_id=self.message_id,
+                    delete_after=delete_after,
+                    **kwargs
+                )
+            class Pick:
+                def __init__(self, bot, chat_id, message_id):
+                    self.bot = bot
+                    self.chat_id = chat_id
+                    self.message_id = message_id
+
+                def edit(self, new_text):
+                    async def _edit():
+                        func = self.bot.edit_message_text
+                        if inspect.iscoroutinefunction(func):
+                            await func(self.chat_id, self.message_id, new_text)
+                        else:
+                            func(self.chat_id, self.message_id, new_text)
+
+                    try:
+                        loop = asyncio.get_running_loop()
+                        if loop.is_running():
+                            return asyncio.create_task(_edit())
+                    except RuntimeError:
+                        return asyncio.run(_edit())
+
+                def delete(self):
+                    async def _delete():
+                        func = self.bot.delete_message
+                        if inspect.iscoroutinefunction(func):
+                            await func(self.chat_id, self.message_id)
+                        else:
+                            func(self.chat_id, self.message_id)
+                    try:
+                        loop = asyncio.get_running_loop()
+                        if loop.is_running():
+                            return asyncio.create_task(_delete())
+                    except RuntimeError:
+                        return asyncio.run(_delete())
+            chat_id = msg.get("chat_id") if isinstance(msg, dict) else getattr(msg, "chat_id", self.chat_id)
+            message_id = msg.get("message_id") if isinstance(msg, dict) else getattr(msg, "message_id", self.message_id)
+            return Pick(self.bot, chat_id, message_id)
+        try:
+            loop = asyncio.get_running_loop()
+            if loop.is_running():
+                return asyncio.create_task(_reply_async())
+        except RuntimeError:
+            return asyncio.run(_reply_async())
     def answer(self, text: str, **kwargs):
         return self.bot.send_message(
             self.chat_id,
@@ -631,6 +815,7 @@ class InlineMessage:
             reply_to_message_id=self.message_id,
             **kwargs
         )
+    
 
     def reply_poll(self, question: str, options: List[str], **kwargs) -> Dict[str, Any]:
         return self.bot._post("sendPoll", {
@@ -841,4 +1026,12 @@ class InlineMessage:
         return self.bot.delete_message(
             chat_id=self.chat_id,
             message_id=self.message_id
-        )
+        )
+    @hybrid_property
+    async def author_name(self):return await self.bot.get_name(self.chat_id)
+    @hybrid_property
+    async def name(self):return await self.bot.get_name(self.chat_id)
+    @hybrid_property
+    async def username(self):return await self.bot.get_username(self.chat_id)
+    @hybrid_property
+    async def author_info(self):return await self.bot.get_chat(self.chat_id)

rubka-7.1.8/rubka/context.py → rubka-7.1.10/rubka/update.py

@@ -3,6 +3,66 @@ from pathlib import Path
 from typing import List, Optional, Dict, Any, Literal, Callable, Union,Set
 import re,inspect
 import asyncio
+_EMOJI_PATTERN = re.compile(
+    "["
+    "\U0001F300-\U0001F5FF"
+    "\U0001F600-\U0001F64F"
+    "\U0001F680-\U0001F6FF"
+    "\U0001F700-\U0001F77F"
+    "\U0001F780-\U0001F7FF"
+    "\U0001F800-\U0001F8FF"
+    "\U0001F900-\U0001F9FF"
+    "\U0001FA00-\U0001FA6F"
+    "\U0001FA70-\U0001FAFF"
+    "\U00002700-\U000027BF"
+    "\U00002600-\U000026FF"
+    "\U00002000-\U000023FF" 
+    "]+", 
+    flags=re.UNICODE
+)
+
+def contains_emoji(text: str) -> bool:
+    if not text:return False
+    return bool(_EMOJI_PATTERN.search(text))
+
+def count_emojis(text: str) -> int:
+    if not text:return 0
+    return len(_EMOJI_PATTERN.findall(text))
+def contains_link_or_mention(text: str) -> bool:
+    if not text:return False
+    pattern = re.compile(
+        r"(?i)\b("
+        r"https?://[^\s]+"
+        r"|www\.[^\s]+"
+        r"|[a-zA-Z0-9.-]+\.(com|net|org|ir|edu|gov|info|biz|io|me|co|xyz|in|us|uk|ru|tv|cc|app|dev|site|store|cloud|shop)"
+        r"|t\.me/[^\s]+"
+        r"|telegram\.me/[^\s]+"
+        r"|rubika\.(ir|app)/[^\s]+"
+        r"|whatsapp\.com/[^\s]+"
+        r"|wa\.me/[^\s]+"
+        r"|instagram\.com/[^\s]+"
+        r"|instagr\.am/[^\s]+"
+        r"|youtube\.com/[^\s]+"
+        r"|youtu\.be/[^\s]+"
+        r"|aparat\.com/[^\s]+"
+        r"|discord\.gg/[^\s]+"
+        r"|discord\.com/[^\s]+"
+        r"|splus\.ir/[^\s]+"
+        r"|eitaa\.com/[^\s]+"
+        r"|ble\.ir/[^\s]+"
+        r"|gap\.im/[^\s]+"
+        r"|rubino\.ir/[^\s]+"
+        r"|pin\.it/[^\s]+"
+        r"|twitter\.com/[^\s]+"
+        r"|x\.com/[^\s]+"
+        r"|facebook\.com/[^\s]+"
+        r"|threads\.net/[^\s]+"
+        r"|@\w+"
+        r"|\b\d{1,3}(?:\.\d{1,3}){3}\b" 
+        r"|\[?[A-F0-9:]{2,39}\]?"
+        r")\b"
+    )
+    return bool(pattern.search(text))
 class File:
     def __init__(self, data: dict):
         self.file_id: str = data.get("file_id")
@@ -215,10 +275,51 @@ class Message:
         self.author_guid  = self.raw_data.get("sender_id", sender_id)
         self.message_id: str = self.raw_data.get("message_id", message_id)
         self.text: str = self.raw_data.get("text", text)
-        self.has_link = bool(re.search(
-    r"(https?://[^\s]+|www\.[^\s]+|[a-zA-Z0-9.-]+\.(com|net|org|ir|edu|gov|info|biz|io|me|co)|t\.me/[^\s]+|telegram\.me/[^\s]+|@\w+|\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b)",
-    self.raw_data.get("text", text) or ""
-))
+        self.has_link = contains_link_or_mention(self.raw_data.get("text", text))
+        self.is_link = self.has_link
+        self.is_mention = bool(re.search(r"@\w+", self.raw_data.get("text", text) or ""))
+        self.is_hashtag = bool(re.search(r"#\w+", text or ""))
+        self.is_number = bool(re.search(r"\d+", text or ""))
+        self.is_emoji = contains_emoji(self.raw_data.get("text", text))
+        self.emoji_count = count_emojis(self.raw_data.get("text", text))
+        self.is_pure_emoji = bool(self.is_emoji and self.emoji_count == len(self.text))
+        self.is_photo = None
+        self.is_video = None
+        self.is_audio = None
+        self.is_voice = None
+        self.is_document = None
+        self.is_archive = None
+        self.is_executable = None
+        self.is_font = None
+        self.metadata = self.raw_data.get("metadata", {})
+        self.meta_parts = self.metadata.get("meta_data_parts", [])
+        self.has_metadata = bool(self.meta_parts)
+        self.meta_types = [part.get("type") for part in self.meta_parts] if self.has_metadata else []
+        self.is_bold = "Bold" in self.meta_types
+        self.is_italic = "Italic" in self.meta_types
+        self.is_strike = "Strike" in self.meta_types
+        self.is_underline = "Underline" in self.meta_types
+        self.is_quote = "Quote" in self.meta_types
+        self.is_spoiler = "Spoiler" in self.meta_types
+        self.is_pre = "Pre" in self.meta_types
+        self.is_mono = "Mono" in self.meta_types
+        self.is_link_meta = "Link" in self.meta_types
+        self.meta_links = [part.get("link_url") for part in self.meta_parts if part.get("type") == "Link"]
+        self.meta_link_positions = [
+            {"from": part.get("from_index"), "length": part.get("length"), "url": part.get("link_url")}
+            for part in self.meta_parts if part.get("type") == "Link"
+        ]
+        self.has_link = contains_link_or_mention(self.text) or self.is_link_meta
+        self.is_formatted = any([
+            self.is_bold,
+            self.is_italic,
+            self.is_strike,
+            self.is_underline,
+            self.is_quote,
+            self.is_spoiler,
+            self.is_pre,
+            self.is_mono
+        ])
         self.sender_id: str = self.raw_data.get("sender_id", sender_id)
         self.time: str = self.raw_data.get("time")
         self.is_edited: bool = self.raw_data.get("is_edited", False)

{rubka-7.1.8 → rubka-7.1.10}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setup(
     name='Rubka',
-    version='7.1.8',
+    version='7.1.10',
     description=(
     "Rubika: A Python library for interacting with the Rubika Bot API. "
     "This library provides an easy-to-use interface to send messages, polls, "
@@ -49,7 +49,6 @@ setup(
     python_requires='>=3.6',
     install_requires=[
         "requests",
-        "Pillow",
         "websocket-client",
         'pycryptodome',
         'aiohttp',