some reverts and switch back to pyrofork

Signed-off-by: anasty17 <[email protected]>

Author: anasty17

bot/__init__.py

@@ -26,7 +26,6 @@
 from time import time
 from tzlocal import get_localzone
 from uvloop import install
-from concurrent.futures import ThreadPoolExecutor
 
 # from faulthandler import enable as faulthandler_enable
 # faulthandler_enable()
@@ -49,9 +48,6 @@
     bot_loop = new_event_loop()
     set_event_loop(bot_loop)
 
-THREADPOOL = ThreadPoolExecutor(max_workers=99999)
-bot_loop.set_default_executor(THREADPOOL)
-
 basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
     handlers=[FileHandler("log.txt"), StreamHandler()],

bot/__main__.py

@@ -13,7 +13,6 @@
 )
 from pyrogram.filters import command
 from pyrogram.handlers import MessageHandler
-from pyrogram.types import LinkPreviewOptions
 from signal import signal, SIGINT
 from sys import executable
 from time import time
@@ -231,7 +230,7 @@ async def send_incomplete_task_message(cid, msg):
                 await bot.send_message(
                     chat_id=cid,
                     text=msg,
-                    link_preview_options=LinkPreviewOptions(is_disabled=True),
+                    disable_web_page_preview=True,
                     disable_notification=True,
                 )
         except Exception as e:

bot/helper/ext_utils/bot_utils.py

@@ -1,6 +1,7 @@
 from httpx import AsyncClient
 from asyncio.subprocess import PIPE
 from functools import partial, wraps
+from concurrent.futures import ThreadPoolExecutor
 from asyncio import (
     create_subprocess_exec,
     create_subprocess_shell,
@@ -18,6 +19,7 @@
 )
 
 COMMAND_USAGE = {}
+THREADPOOL = ThreadPoolExecutor(max_workers=99999)
 
 
 class SetInterval:
@@ -213,7 +215,7 @@ def wrapper(*args, **kwargs):
 
 async def sync_to_async(func, *args, wait=True, **kwargs):
     pfunc = partial(func, *args, **kwargs)
-    future = bot_loop.run_in_executor(None, pfunc)
+    future = bot_loop.run_in_executor(THREADPOOL, pfunc)
     return await future if wait else future
 
 

bot/helper/ext_utils/status_utils.py

@@ -61,17 +61,17 @@ async def get_task_by_gid(gid: str):
         return None
 
 
-def get_specific_tasks(status, userId):
+def get_specific_tasks(status, user_id):
     if status == "All":
-        if userId:
-            return [tk for tk in task_dict.values() if tk.listener.user_id == userId]
+        if user_id:
+            return [tk for tk in task_dict.values() if tk.listener.user_id == user_id]
         else:
             return list(task_dict.values())
-    elif userId:
+    elif user_id:
         return [
             tk
             for tk in task_dict.values()
-            if tk.listener.user_id == userId
+            if tk.listener.user_id == user_id
             and (
                 (st := tk.status())
                 and st == status
@@ -90,23 +90,21 @@ def get_specific_tasks(status, userId):
         ]
 
 
-async def get_all_tasks(req_status: str, userId):
+async def get_all_tasks(req_status: str, user_id):
     async with task_dict_lock:
-        return await sync_to_async(get_specific_tasks, req_status, userId)
+        return await sync_to_async(get_specific_tasks, req_status, user_id)
 
 
 def get_readable_file_size(size_in_bytes: int):
-    if size_in_bytes is None:
+    if not isinstance(size_in_bytes, int) or size_in_bytes < 0:
         return "0B"
+
     index = 0
     while size_in_bytes >= 1024 and index < len(SIZE_UNITS) - 1:
         size_in_bytes /= 1024
         index += 1
-    return (
-        f"{size_in_bytes:.2f}{SIZE_UNITS[index]}"
-        if index > 0
-        else f"{size_in_bytes:.2f}B"
-    )
+
+    return f"{size_in_bytes:.2f}{SIZE_UNITS[index]}"
 
 
 def get_readable_time(seconds: int):

bot/helper/mirror_leech_utils/telegram_uploader.py

@@ -17,7 +17,6 @@
     InputMediaVideo,
     InputMediaDocument,
     InputMediaPhoto,
-    LinkPreviewOptions,
 )
 from tenacity import (
     retry,
@@ -98,15 +97,15 @@ async def _msg_to_reply(self):
                     self._sent_msg = await user.send_message(
                         chat_id=self._listener.up_dest,
                         text=msg,
-                        link_preview_options=LinkPreviewOptions(is_disabled=True),
+                        disable_web_page_preview=True,
                         message_thread_id=self._listener.chat_thread_id,
                         disable_notification=True,
                     )
                 else:
                     self._sent_msg = await self._listener.client.send_message(
                         chat_id=self._listener.up_dest,
                         text=msg,
-                        link_preview_options=LinkPreviewOptions(is_disabled=True),
+                        disable_web_page_preview=True,
                         message_thread_id=self._listener.chat_thread_id,
                         disable_notification=True,
                     )
@@ -122,7 +121,7 @@ async def _msg_to_reply(self):
                 self._sent_msg = await user.send_message(
                     chat_id=self._listener.message.chat.id,
                     text="Deleted Cmd Message! Don't delete the cmd message again!",
-                    link_preview_options=LinkPreviewOptions(is_disabled=True),
+                    disable_web_page_preview=True,
                     disable_notification=True,
                 )
         else:

bot/helper/telegram_helper/message_utils.py

@@ -1,6 +1,5 @@
 from asyncio import sleep
 from pyrogram.errors import FloodWait, FloodPremiumWait
-from pyrogram.types import LinkPreviewOptions
 from re import match as re_match
 from time import time
 
@@ -15,7 +14,7 @@ async def send_message(message, text, buttons=None, block=True):
         return await message.reply(
             text=text,
             quote=True,
-            link_preview_options=LinkPreviewOptions(is_disabled=True),
+            disable_web_page_preview=True,
             disable_notification=True,
             reply_markup=buttons,
         )
@@ -34,7 +33,7 @@ async def edit_message(message, text, buttons=None, block=True):
     try:
         await message.edit(
             text=text,
-            link_preview_options=LinkPreviewOptions(is_disabled=True),
+            disable_web_page_preview=True,
             reply_markup=buttons,
         )
     except FloodWait as f:
@@ -68,7 +67,7 @@ async def send_rss(text):
         return await app.send_message(
             chat_id=config_dict["RSS_CHAT"],
             text=text,
-            link_preview_options=LinkPreviewOptions(is_disabled=True),
+            disable_web_page_preview=True,
             disable_notification=True,
         )
     except (FloodWait, FloodPremiumWait) as f:

bot/modules/cancel_task.py

@@ -75,8 +75,8 @@ async def cancel_multi(_, query):
     await delete_message(query.message)
 
 
-async def cancel_all(status, userId):
-    matches = await get_all_tasks(status.strip(), userId)
+async def cancel_all(status, user_id):
+    matches = await get_all_tasks(status.strip(), user_id)
     if not matches:
         return False
     for task in matches:
@@ -86,41 +86,45 @@ async def cancel_all(status, userId):
     return True
 
 
-def create_cancel_buttons(isSudo, userId=""):
+def create_cancel_buttons(is_sudo, user_id=""):
     buttons = button_build.ButtonMaker()
     buttons.data_button(
-        "Downloading", f"canall ms {MirrorStatus.STATUS_DOWNLOADING} {userId}"
+        "Downloading", f"canall ms {MirrorStatus.STATUS_DOWNLOADING} {user_id}"
     )
     buttons.data_button(
-        "Uploading", f"canall ms {MirrorStatus.STATUS_UPLOADING} {userId}"
+        "Uploading", f"canall ms {MirrorStatus.STATUS_UPLOADING} {user_id}"
     )
-    buttons.data_button("Seeding", f"canall ms {MirrorStatus.STATUS_SEEDING} {userId}")
+    buttons.data_button("Seeding", f"canall ms {MirrorStatus.STATUS_SEEDING} {user_id}")
     buttons.data_button(
-        "Spltting", f"canall ms {MirrorStatus.STATUS_SPLITTING} {userId}"
+        "Spltting", f"canall ms {MirrorStatus.STATUS_SPLITTING} {user_id}"
     )
-    buttons.data_button("Cloning", f"canall ms {MirrorStatus.STATUS_CLONING} {userId}")
+    buttons.data_button("Cloning", f"canall ms {MirrorStatus.STATUS_CLONING} {user_id}")
     buttons.data_button(
-        "Extracting", f"canall ms {MirrorStatus.STATUS_EXTRACTING} {userId}"
+        "Extracting", f"canall ms {MirrorStatus.STATUS_EXTRACTING} {user_id}"
     )
     buttons.data_button(
-        "Archiving", f"canall ms {MirrorStatus.STATUS_ARCHIVING} {userId}"
+        "Archiving", f"canall ms {MirrorStatus.STATUS_ARCHIVING} {user_id}"
     )
-    buttons.data_button("QueuedDl", f"canall ms {MirrorStatus.STATUS_QUEUEDL} {userId}")
-    buttons.data_button("QueuedUp", f"canall ms {MirrorStatus.STATUS_QUEUEUP} {userId}")
     buttons.data_button(
-        "SampleVideo", f"canall ms {MirrorStatus.STATUS_SAMVID} {userId}"
+        "QueuedDl", f"canall ms {MirrorStatus.STATUS_QUEUEDL} {user_id}"
     )
     buttons.data_button(
-        "ConvertMedia", f"canall ms {MirrorStatus.STATUS_CONVERTING} {userId}"
+        "QueuedUp", f"canall ms {MirrorStatus.STATUS_QUEUEUP} {user_id}"
     )
-    buttons.data_button("Paused", f"canall ms {MirrorStatus.STATUS_PAUSED} {userId}")
-    buttons.data_button("All", f"canall ms All {userId}")
-    if isSudo:
-        if userId:
-            buttons.data_button("All Added Tasks", f"canall bot ms {userId}")
+    buttons.data_button(
+        "SampleVideo", f"canall ms {MirrorStatus.STATUS_SAMVID} {user_id}"
+    )
+    buttons.data_button(
+        "ConvertMedia", f"canall ms {MirrorStatus.STATUS_CONVERTING} {user_id}"
+    )
+    buttons.data_button("Paused", f"canall ms {MirrorStatus.STATUS_PAUSED} {user_id}")
+    buttons.data_button("All", f"canall ms All {user_id}")
+    if is_sudo:
+        if user_id:
+            buttons.data_button("All Added Tasks", f"canall bot ms {user_id}")
         else:
-            buttons.data_button("My Tasks", f"canall user ms {userId}")
-    buttons.data_button("Close", f"canall close ms {userId}")
+            buttons.data_button("My Tasks", f"canall user ms {user_id}")
+    buttons.data_button("Close", f"canall close ms {user_id}")
     return buttons.build_menu(2)
 
 
@@ -131,8 +135,8 @@ async def cancell_all_buttons(_, message):
     if count == 0:
         await send_message(message, "No active tasks!")
         return
-    isSudo = await CustomFilters.sudo("", message)
-    button = create_cancel_buttons(isSudo, message.from_user.id)
+    is_sudo = await CustomFilters.sudo("", message)
+    button = create_cancel_buttons(is_sudo, message.from_user.id)
     can_msg = await send_message(message, "Choose tasks to cancel!", button)
     await auto_delete_message(message, can_msg)
 
@@ -142,37 +146,37 @@ async def cancel_all_update(_, query):
     data = query.data.split()
     message = query.message
     reply_to = message.reply_to_message
-    userId = int(data[3]) if len(data) > 3 else ""
-    isSudo = await CustomFilters.sudo("", query)
-    if not isSudo and userId and userId != query.from_user.id:
+    user_id = int(data[3]) if len(data) > 3 else ""
+    is_sudo = await CustomFilters.sudo("", query)
+    if not is_sudo and user_id and user_id != query.from_user.id:
         await query.answer("Not Yours!", show_alert=True)
     else:
         await query.answer()
     if data[1] == "close":
         await delete_message(reply_to)
         await delete_message(message)
     elif data[1] == "back":
-        button = create_cancel_buttons(isSudo, userId)
+        button = create_cancel_buttons(is_sudo, user_id)
         await edit_message(message, "Choose tasks to cancel!", button)
     elif data[1] == "bot":
-        button = create_cancel_buttons(isSudo, "")
+        button = create_cancel_buttons(is_sudo, "")
         await edit_message(message, "Choose tasks to cancel!", button)
     elif data[1] == "user":
-        button = create_cancel_buttons(isSudo, query.from_user.id)
+        button = create_cancel_buttons(is_sudo, query.from_user.id)
         await edit_message(message, "Choose tasks to cancel!", button)
     elif data[1] == "ms":
         buttons = button_build.ButtonMaker()
-        buttons.data_button("Yes!", f"canall {data[2]} confirm {userId}")
-        buttons.data_button("Back", f"canall back confirm {userId}")
-        buttons.data_button("Close", f"canall close confirm {userId}")
+        buttons.data_button("Yes!", f"canall {data[2]} confirm {user_id}")
+        buttons.data_button("Back", f"canall back confirm {user_id}")
+        buttons.data_button("Close", f"canall close confirm {user_id}")
         button = buttons.build_menu(2)
         await edit_message(
             message, f"Are you sure you want to cancel all {data[2]} tasks", button
         )
     else:
-        button = create_cancel_buttons(isSudo, userId)
+        button = create_cancel_buttons(is_sudo, user_id)
         await edit_message(message, "Choose tasks to cancel.", button)
-        res = await cancel_all(data[1], userId)
+        res = await cancel_all(data[1], user_id)
         if not res:
             await send_message(reply_to, f"No matching tasks for {data[1]}!")
 

requirements.txt

@@ -21,7 +21,7 @@ pillow
 psutil
 pycryptodome
 pymongo
-pyrotgfork
+pyrofork
 python-dotenv
 python-magic
 qbittorrent-api