Rubka 7.1.5__py3-none-any.whl → 7.1.7__py3-none-any.whl

rubka/asynco.py

@@ -1054,7 +1054,7 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             self._processed_message_ids.popitem(last=False)
         return False
 
-    async def run(
+    async def run_progelry(
     self,
     debug: bool = False,
     sleep_time: float = 0.1,
@@ -1414,7 +1414,7 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         await check_rubka_version()
         await self._initialize_webhook()
         await self.geteToken()
-        _log("Bot started running...", "info")
+        _log("Bot is up and running...", "info")
 
         try:
             while True:
@@ -1641,6 +1641,11 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             
             
             _log("Auto-restart requested. You can call run(...) again as needed.", "warning")
+    def run(self, sleep_time : float = 0.1 ,*args, **kwargs):
+        print("Connecting to the server...")
+        loop = asyncio.get_event_loop()
+        if loop.is_running():return loop.create_task(self.run_progelry(sleep_time=sleep_time,*args, **kwargs))
+        else:return asyncio.run(self.run_progelry(sleep_time=sleep_time,*args, **kwargs))
     async def _delete_after_task(self, chat_id: str, message_id: str, delay: int):
         try:
             await asyncio.sleep(delay)
@@ -2231,8 +2236,8 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         return await self._post("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
     async def edit_chat_keypad(self, chat_id: str, chat_keypad: Dict[str, Any]) -> Dict[str, Any]:
         return await self._post("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad})
-    async def send_contact(self, chat_id: str, first_name: str, last_name: str, phone_number: str) -> Dict[str, Any]:
-        return await self._post("sendContact", {"chat_id": chat_id, "first_name": first_name, "last_name": last_name, "phone_number": phone_number})
+    async def send_contact(self, chat_id: str, first_name: str, last_name: str, phone_number: str,inline_keypad: Optional[Dict[str, Any]] = None,chat_keypad: Optional[Dict[str, Any]] = None,chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = None,) -> Dict[str, Any]:
+        return await self._post("sendContact", {"chat_id": chat_id, "first_name": first_name, "last_name": last_name, "phone_number": phone_number,"inline_keypad": inline_keypad,"chat_keypad": chat_keypad,"chat_keypad_type": chat_keypad_type})
     async def get_chat(self, chat_id: str) -> Dict[str, Any]:
         return await self._post("getChat", {"chat_id": chat_id})
     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") -> Dict[str, Any]:
@@ -2256,42 +2261,42 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         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,
+        inline_keypad: Optional[Dict[str, Any]] = None,
         chat_keypad: Optional[Dict[str, Any]] = None,
         chat_keypad_type: Optional[Literal["New", "Remove", "None"]] = None,
-
     ) -> AttrDict:
-        return await self._post(
-            "sendPoll", {
-                "chat_id": chat_id,
-                "question": question,
-                "options": options,
-                "type": type,
-                "allows_multiple_answers": allows_multiple_answers,
-                "is_anonymous": is_anonymous,
-                "correct_option_index": correct_option_index,
-                "explanation": hint,
-                "show_results":show_results,
-                "reply_to_message_id": reply_to_message_id,
-                "disable_notification": disable_notification,
-                "chat_keypad": chat_keypad,
-                "inline_keypad":inline_keypad,
-                "chat_keypad_type": chat_keypad_type,
-            }
-        )
+
+        payload = {
+            "chat_id": chat_id,
+            "question": question,
+            "options": options,
+            "type": type,
+            "allows_multiple_answers": allows_multiple_answers,
+            "is_anonymous": is_anonymous,
+            "correct_option_index": correct_option_index,
+            "explanation": hint,
+            "reply_to_message_id": reply_to_message_id,
+            "disable_notification": disable_notification,
+            "inline_keypad": inline_keypad,
+            "chat_keypad": chat_keypad,
+            "chat_keypad_type": chat_keypad_type,
+        }
+        payload = {k: v for k, v in payload.items() if v is not None or (k in ["is_anonymous", "disable_notification"] and v is False)}
+        return await self._post("sendPoll", payload)
+
     async def check_join(self, channel_guid: str, chat_id: str = None) -> Union[bool, list[str]]:
         client = self._get_client()
         if chat_id:
             chat_info_data = await self.get_chat(chat_id)
             chat_info = chat_info_data.get('data', {}).get('chat', {})
             username = chat_info.get('username')
-            user_id = chat_info.get('user_id')
+            first_name = chat_info.get("first_name", "")
             if username:
                 result = await asyncio.to_thread(self.get_all_member, channel_guid, search_text=username)
                 members = result.get('in_chat_members', [])
                 return any(m.get('username') == username for m in members)
-            elif user_id:
-                member_guids = await asyncio.to_thread(client.get_all_members, channel_guid, just_get_guids=True)
-                return user_id in member_guids
+            elif first_name:
+                result = await asyncio.to_thread(self.get_all_member, channel_guid, search_text=first_name)
+                members = result.get('in_chat_members', [])
+                return any(m.get('first_name') == first_name for m in members)
         return False

rubka/rubino.py

@@ -1,10 +1,14 @@
 import urllib3
-import json
-from typing import Any, Dict
+import json,random
+from typing import Any, Dict,List
 from tempfile import NamedTemporaryFile
 from os import system, chmod, remove
 from base64 import b64encode
 from io import BytesIO
+class InvalidInputError(Exception):
+    def __init__(self, message="Invalid input provided"):
+        self.message = message
+        super().__init__(self.message)
 class confing():
     headers= {
         "User-Agent": "okhttp/3.12.1",
@@ -192,9 +196,15 @@ class req:
             except:
                 continue
             else:
-                if 'data_enc' in  response.json():
-                    return loads(self.enc.decrypt(response.json()['data_enc']))
-                return response.json()
+                
+                response_data = response.json()
+
+                if 'data_enc' in response_data:
+                    return loads(self.enc.decrypt(response_data['data_enc']))
+                if response_data.get('status') != "OK":
+                    raise InvalidInputError(f"Error : {response_data.get('status_det', 'Unknown error')}")
+                return response_data
+
         
     def requestUploadFile(self,file_name:str,size:str,file_type:str,profile_id:str=None):
         return self.send_request({
@@ -203,6 +213,7 @@ class req:
             "file_type": file_type,
             "profile_id": profile_id
         },"requestUploadFile")
+    
 
     def upload(self, post_file, post_type: str, profile_id: str = None):
         file_byte_code = post_file if isinstance(post_file, bytes) else open(post_file, "rb").read()
@@ -406,24 +417,7 @@ class api:
             response_data = json.loads(response.data.decode('utf-8'))
             if 'result' in response_data:
                     return response_data['result']
-def _req(term, results, lang, start, proxies, timeout):
-    resp = get(
-        url="https://www.google.com/search",
-        headers={
-            "User-Agent": get_useragent()
-        },
-        params={
-            "q": term,
-            "num": results + 2,  # Prevents multiple requests
-            "hl": lang,
-            "start": start,
-        },
-        proxies=proxies,
-        timeout=timeout,
-    )
-    resp.raise_for_status()
-    return resp
-import random
+
 
 class Bot():
     """rubino class Regester m.rubika.ir"""
@@ -476,11 +470,12 @@ class Bot():
         if response.status == 200:
             response_data = json.loads(response.data.decode('utf-8'))
             if 'data' in response_data:
-                    return response_data['data']
+                return response_data['data']
             else:
-                return response_data['status_det']
-        else :
-            raise Exception("Request Error Server")
+                raise Exception(f"Error: {response_data.get('status_det', 'Unknown error')}")
+        else:
+            raise Exception(f"Request Error Server - Status Code: {response.status}")
+
     def edit_info_page(
         self,
         username_me:str,
@@ -663,6 +658,49 @@ class Bot():
             return [668,789]
         except Exception as e:
             return [668,789]
+    def add_Story(self,post_file:str,duration:int=27,size:list=[668,798],thumbnail_file:str=None,profile_id:str=None):
+        
+        if post_file.split(".")[-1] == "mp4" or post_file.split(".")[-1] == "mov" or post_file.split(".")[-1] == "mkv" or "https://":
+            try:
+                if "https://" in post_file:
+                    tumb_res , post_res = req(self.auth).upload(image_to_bytes(thumbnail_file) if type(thumbnail_file) is str else confing.th,"Picture",profile_id) , req(self.auth).upload(requests.get(post_file).content,"Video",profile_id)
+                else :
+                    tumb_res , post_res = req(self.auth).upload(image_to_bytes(thumbnail_file) if type(thumbnail_file) is str else confing.th,"Picture",profile_id) , req(self.auth).upload(post_file,"Video",profile_id)
+            except ModuleNotFoundError:
+                print("pip install moviepy")
+                tumb_res , post_res = req(self.auth).upload(confing.th,"Picture",profile_id) , req(self.auth).upload(post_file,"Video",profile_id)
+            data = {
+                "duration": str(duration),
+                "file_id": post_res[0]["file_id"],
+                "hash_file_receive": post_res[1],
+                "height": 1280 if size[1] > 1280 else size[1],
+                "story_type": "Video",
+                "rnd": random.randint(100000, 999999999),
+                "snapshot_file_id": tumb_res[0]["file_id"],
+                "snapshot_hash_file_receive": tumb_res[1],
+                "thumbnail_file_id": tumb_res[0]["file_id"],
+                "thumbnail_hash_file_receive": tumb_res[1],
+                "width": 720 if size[0] > 720 else size[0],
+                "profile_id": profile_id
+            }
+                
+        elif post_file.split(".")[-1] == "jpg" or post_file.split(".")[-1] == "png":
+            post_res = req(self.auth).upload(post_file,"Picture",profile_id)
+
+            data = {
+                "file_id": post_res[0]["file_id"],
+                "hash_file_receive": post_res[1],
+                "height": 1280 if size[1] > 1280 else size[1],
+                "story_type": "Picture",
+                "rnd": random.randint(100000, 999999999),
+                "thumbnail_file_id": post_res[0]["file_id"],
+                "thumbnail_hash_file_receive": post_res[1],
+                "width": 720 if size[0] > 720 else size[0],
+                "profile_id": profile_id
+            }
+        else:
+            return "file address eror"
+        return req(self.auth).send_request(data,"addStory")['data']
     def add_Post(self,post_file: str, caption: str = None, time: int = 1, size: Any = [668, 798], thumbnail_file: str = None, profile_id: str = None):
         from concurrent.futures import ThreadPoolExecutor
         if size == "Auto" or size =="auto":
@@ -968,28 +1006,6 @@ class Bot():
             "target_profile_id": target_profile_id,
             "story_ids":story_ids
         },methode="getHighlightStories")
-    
-    def get_NewFollow_Requests(self,sort:str="FromMax",limit:int=50,equal:bool=False,profile_id:str=None):
-        return self._reuests_post(data={
-            "equal": equal,
-            "limit": limit,
-            "sort": sort,
-            "profile_id": profile_id
-        },methode="getNewFollowRequests")
-    
-    def accept_Request_Follow(self,request_id:str,profile_id:str=None):
-        return self._reuests_post(data={
-            "action": "Accept",
-            "request_id": request_id,
-            "profile_id": profile_id
-        },methode="actionOnRequest")
-    
-    def decline_Request_Follow(self,request_id:str,profile_id:str=None):
-        return self._reuests_post(data={
-            "action": "Decline",
-            "request_id": request_id,
-            "profile_id": profile_id
-        },methode="actionOnRequest")
     def un_save_Post(self,post_profile_id:str,post_id:str,profile_id:str=None):
         return self._reuests_post(data={
             "action_type": "Unbookmark",
@@ -1004,24 +1020,11 @@ class Bot():
     limit: int = 20,
     profile_id: Optional[str] = None,
     sort: str = "FromMax") -> Dict[str, Any]:
-        """
-        دریافت پست‌های ذخیره‌شده (بوکمارک‌شده)
-
-        Args:
-            max_id (str): شناسه آخرین پست برای صفحه‌بندی.
-            limit (int, optional): تعداد پست‌ها در هر درخواست. پیش‌فرض 20.
-            profile_id (str, optional): شناسه پروفایل (در صورت نیاز).
-            sort (str, optional): نوع مرتب‌سازی. پیش‌فرض "FromMax".
-
-        Returns:
-            Dict[str, Any]: پاسخ سرور شامل لیست پست‌های ذخیره‌شده.
-        """
         payload = {
             "limit": limit,
             "max_id": max_id,
             "sort": sort
         }
-
         if profile_id is not None:
             payload["profile_id"] = profile_id
 
@@ -1115,49 +1118,7 @@ class Bot():
             "thumbnail_hash_file_receive": prof_res[1],
             "profile_id": profile_id
         },methode="updateProfilePhoto")
-    def add_Story(self,post_file:str,duration:int=27,size:list=[668,798],thumbnail_file:str=None,profile_id:str=None):
-        
-        if post_file.split(".")[-1] == "mp4" or post_file.split(".")[-1] == "mov" or post_file.split(".")[-1] == "mkv" or "https://":
-            try:
-                if "https://" in post_file:
-                    tumb_res , post_res = req(self.auth).upload(image_to_bytes(thumbnail_file) if type(thumbnail_file) is str else confing.th,"Picture",profile_id) , req(self.auth).upload(requests.get(post_file).content,"Video",profile_id)
-                else :
-                    tumb_res , post_res = req(self.auth).upload(image_to_bytes(thumbnail_file) if type(thumbnail_file) is str else confing.th,"Picture",profile_id) , req(self.auth).upload(post_file,"Video",profile_id)
-            except ModuleNotFoundError:
-                print("pip install moviepy")
-                tumb_res , post_res = req(self.auth).upload(confing.th,"Picture",profile_id) , req(self.auth).upload(post_file,"Video",profile_id)
-            data = {
-                "duration": str(duration),
-                "file_id": post_res[0]["file_id"],
-                "hash_file_receive": post_res[1],
-                "height": 1280 if size[1] > 1280 else size[1],
-                "story_type": "Video",
-                "rnd": random.randint(100000, 999999999),
-                "snapshot_file_id": tumb_res[0]["file_id"],
-                "snapshot_hash_file_receive": tumb_res[1],
-                "thumbnail_file_id": tumb_res[0]["file_id"],
-                "thumbnail_hash_file_receive": tumb_res[1],
-                "width": 720 if size[0] > 720 else size[0],
-                "profile_id": profile_id
-            }
-                
-        elif post_file.split(".")[-1] == "jpg" or post_file.split(".")[-1] == "png":
-            post_res = req(self.auth).upload(post_file,"Picture",profile_id)
-
-            data = {
-                "file_id": post_res[0]["file_id"],
-                "hash_file_receive": post_res[1],
-                "height": 1280 if size[1] > 1280 else size[1],
-                "story_type": "Picture",
-                "rnd": random.randint(100000, 999999999),
-                "thumbnail_file_id": post_res[0]["file_id"],
-                "thumbnail_hash_file_receive": post_res[1],
-                "width": 720 if size[0] > 720 else size[0],
-                "profile_id": profile_id
-            }
-        else:
-            return "file address eror"
-        return req(self.auth).send_request(data,"addStory")['data']
+    
     def delete_Page(self,page_profile_id:str):
         return self._reuests_post(data={
             "model": "Profile",
@@ -1189,4 +1150,82 @@ class Bot():
         return self._reuests_post(data={
             "share_string": url_post,
             "profile_id": profile_id,
-        },methode="getPostByShareLink")['data']
+        },methode="getPostByShareLink")['data']
+    def search_HashTag(
+        self,
+        content: str,
+        profile_id:str,
+        limit: int = 20,
+    ) -> Dict[str, Any]:
+
+        payload = {
+            "profile_id": profile_id,
+            "content": content,
+            "limit": limit
+        }
+        return self._reuests_post("reportProfile", data=payload)
+    def accept_Follow_Request(
+        self,
+        request_id: str,
+        profile_id: Optional[str] = None
+    ) -> Dict[str, Any]:
+        """
+        Accept a follow request from a user.
+
+        Args:
+            request_id (str): The ID of the follow request.
+            profile_id (Optional[str]): The profile ID of the current user (if available).
+
+        Returns:
+            Dict[str, Any]: The server's response, including action status.
+        """
+        payload = {
+            "action": "Accept",
+            "request_id": request_id,
+            "profile_id": profile_id
+        }
+        return self._reuests_post("actionOnRequest", data=payload)
+    def decline_Follow_Request(
+        self,
+        request_id: str,
+        profile_id: Optional[str] = None
+    ) -> Dict[str, Any]:
+        """
+        Decline a follow request from a user.
+
+        Args:
+            request_id (str): The ID of the follow request.
+            profile_id (Optional[str]): The profile ID of the current user (if available).
+
+        Returns:
+            Dict[str, Any]: The server's response, including action status.
+        """
+        payload = {
+            "action": "Decline",
+            "request_id": request_id,
+            "profile_id": profile_id
+        }
+        return self._reuests_post("actionOnRequest", data=payload)
+    def get_New_Follow_Requests(
+        self,
+        profile_id: Optional[str] = None ,
+        limit: int = 20,
+        sort: str = "FromMax"
+    ) -> Dict[str, Any]:
+        """
+        Retrieve new follow requests for a given profile.
+
+        Args:
+            profile_id (str): The profile ID of the current user.
+            limit (int): The number of requests to fetch. Default is 20.
+            sort (str): The sorting order for the requests. Default is "FromMax".
+
+        Returns:
+            Dict[str, Any]: The server's response containing new follow requests.
+        """
+        payload = {
+            "profile_id": profile_id,
+            "limit": limit,
+            "sort": sort
+        }
+        return self._reuests_post("getNewFollowRequests", data=payload)

{rubka-7.1.5.dist-info → rubka-7.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.5
+Version: 7.1.7
 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.5.dist-info → rubka-7.1.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 rubka/__init__.py,sha256=P6IBiORfp-GqKHe5LZ-5lldWyG7tnrUYUcAQDUgwXmY,1973
 rubka/api.py,sha256=wa1gQj7NDc7QEbmNNRz-TIOdVqfMWFC362tndRKdqig,68449
-rubka/asynco.py,sha256=Zh5_oyiRH7_8xyLABREyI-Qcoy6GkybLgJqlDcR_Mm0,109869
+rubka/asynco.py,sha256=ak94pBGnkPFZwHHOSAsWHo1JtOY92r-DNlzOWQkY_IE,110591
 rubka/button.py,sha256=woSzZVd5MtTqOrP-YgkH5b0GS9y4DuKBsFSc9-KuLnk,13320
 rubka/config.py,sha256=Bck59xkOiqioLv0GkQ1qPGnBXVctz1hKk6LT4h2EPx0,78
 rubka/context.py,sha256=OowmsvqkThzB1NDhK5629Jm4ExdaWcjUo4rsBjpTtjA,38536
@@ -12,7 +12,7 @@ rubka/jobs.py,sha256=GvLMLsVhcSEzRTgkvnPISPEBN71suW2xXI0hUaUZPTo,378
 rubka/keyboards.py,sha256=7nr-dT2bQJVQnQ6RMWPTSjML6EEk6dsBx-4d8pab8xk,488
 rubka/keypad.py,sha256=yGsNt8W5HtUFBzVF1m_p7GySlu1hwIcSvXZ4BTdrlvg,9558
 rubka/logger.py,sha256=J2I6NiK1z32lrAzC4H1Et6WPMBXxXGCVUsW4jgcAofs,289
-rubka/rubino.py,sha256=d_j32FVra8HLsZ-QJC-clChJZK6VFLqgLFAFSr-jRFk,60651
+rubka/rubino.py,sha256=HOILsm2zOIRe9EW1hxhLinhjwE_TvFrOAxBsg9T_L5E,61701
 rubka/tv.py,sha256=rBoyCadCH3I3YqQGrQYv_dLtTg1I63AzVf1orn-hbko,5724
 rubka/update.py,sha256=-oC9h7U_H3CrtqUCDCnFXAvC7zdSmwxlc0CNwL1XLxM,34314
 rubka/utils.py,sha256=XUQUZxQt9J2f0X5hmAH_MH1kibTAfdT1T4AaBkBhBBs,148
@@ -37,8 +37,8 @@ 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-7.1.5.dist-info/METADATA,sha256=a2vt5zLh2ZmkEtDUxihvZbZKAj66TaFN3PrUiiF1RjA,34667
-rubka-7.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubka-7.1.5.dist-info/entry_points.txt,sha256=4aESuUmuUOALMUy7Kucv_Gb5YlqhsJmTmdXLlZU9sJ0,46
-rubka-7.1.5.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
-rubka-7.1.5.dist-info/RECORD,,
+rubka-7.1.7.dist-info/METADATA,sha256=C4Ix4P8Tj4hVdJs1P_ihKu5bKgqzEnEOTcmHTQaAjYo,34667
+rubka-7.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubka-7.1.7.dist-info/entry_points.txt,sha256=4aESuUmuUOALMUy7Kucv_Gb5YlqhsJmTmdXLlZU9sJ0,46
+rubka-7.1.7.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
+rubka-7.1.7.dist-info/RECORD,,