Minor changes

Switched to NekoZee v2 - Specially optimized for download and upload - Handled error in fsub module if the bot is not added into the channels Signed-off-by: Dawn India <[email protected]>
Dawn-India · Aug 23, 2024 · 4003c97 · 4003c97
1 parent 1ebed7c
commit 4003c97
Show file tree

Hide file tree

Showing 38 changed files with 87 additions and 102 deletions.
diff --git a/bot/__init__.py b/bot/__init__.py
@@ -31,7 +31,7 @@
 )
 from pymongo.mongo_client import MongoClient
 from pymongo.server_api import ServerApi
-from pyrogram import (
+from nekozee import (
     Client as tgClient
 )
 from qbittorrentapi import Client as qbClient
@@ -58,7 +58,7 @@
 getLogger("apscheduler").setLevel(ERROR)
 getLogger("httpx").setLevel(ERROR)
 getLogger("pymongo").setLevel(ERROR)
-getLogger("pyrogram").setLevel(ERROR)
+getLogger("nekozee").setLevel(ERROR)
 
 botStartTime = time()
 bot_loop = get_event_loop()
@@ -295,7 +295,6 @@
             app_version="@Z_Mirror Session",
             device_model="@Z_Mirror Bot",
             system_version="@Z_Mirror Server",
-            max_concurrent_transmissions=10,
         ).start()
         IS_PREMIUM_USER = user.me.is_premium # type: ignore
         log_info(f"Successfully logged into @{user.me.username} DC: {user.session.dc_id}.") # type: ignore
@@ -1276,7 +1275,6 @@
     app_version="@Z_Mirror Session",
     device_model="@Z_Mirror Bot",
     system_version="@Z_Mirror Server",
-    max_concurrent_transmissions=10,
 ).start()
 
 BASE += ("oAtiUyppVYRQkuWg8DG2p")

diff --git a/bot/__main__.py b/bot/__main__.py
@@ -8,8 +8,8 @@
     create_subprocess_exec
 )
 from os import execl as osexecl
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 from signal import signal, SIGINT
 from sys import executable
 from time import time

diff --git a/bot/helper/common.py b/bot/helper/common.py
@@ -18,7 +18,7 @@
     move,
     copy2
 )
-from pyrogram.enums import ChatAction
+from nekozee.enums import ChatAction
 from re import sub, I
 
 from bot import (

diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py
@@ -7,7 +7,7 @@
 from asyncio.subprocess import PIPE
 from functools import partial, wraps
 
-from pyrogram.types import BotCommand
+from nekozee.types import BotCommand
 from httpx import AsyncClient
 
 from bot import (

diff --git a/bot/helper/ext_utils/status_utils.py b/bot/helper/ext_utils/status_utils.py
@@ -252,15 +252,15 @@ async def get_readable_message(
             and int(config_dict["AUTO_DELETE_MESSAGE_DURATION"]) > 0
         ):
             msg += (
-                f"<pre>\r\n{index + start_position} ➜ "
-                f"{escape(f"{task.name()}")}\n</pre>"
+                f"<b><i>\n#Zee{index + start_position}: "
+                f"{escape(f"{task.name()}")}\n</i></b>"
                 if elapse <= config_dict["AUTO_DELETE_MESSAGE_DURATION"]
-                else f"\n<blockquote>{index + start_position} ➜ (Processing)</blockquote>"
+                else f"\n<b>#Zee{index + start_position}...(Processing)</b>"
             )
         else:
             msg += (
-                f"<pre>\r\n{index + start_position} ➜ "
-                f"{escape(f"{task.name()}")}\n</pre>"
+                f"<b><i>\n#Zee{index + start_position}: "
+                f"{escape(f"{task.name()}")}\n</i></b>"
             )
         if tstatus not in [
             MirrorStatus.STATUS_SEEDING,
@@ -318,7 +318,7 @@ async def get_readable_message(
                 f"\n<code>UserID :</code> ||{task.listener.userId}||"
                 f"\n<code>Engine :</code> {task.engine}"
             )
-        msg += f"\n<blockquote>⚠️ {cancel_task}</blockquote>\n\n"
+        msg += f"\n⚠️ {cancel_task}\n\n"
 
     if len(msg) == 0:
         if status == "All":

diff --git a/bot/helper/ext_utils/token_manager.py b/bot/helper/ext_utils/token_manager.py
@@ -16,8 +16,8 @@
 from bot.helper.telegram_helper.filters import CustomFilters
 from bot.helper.telegram_helper.message_utils import sendMessage, sendLogMessage
 
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 
 
 async def checking_access(user_id, button=None):

diff --git a/bot/helper/listeners/task_listener.py b/bot/helper/listeners/task_listener.py
@@ -426,7 +426,7 @@ async def onUploadComplete(
         )
         gmsg = f"\n<b>Hey {self.tag}!\nYour job is done.</b>"
         msg = (
-            f"\n\n<blockquote><code>Size  </code>: {get_readable_file_size(self.size)}"
+            f"\n\n<code>Size  </code>: {get_readable_file_size(self.size)}"
             f"\n<code>Past  </code>: {get_readable_time(time() - self.time)}"
             f"\n<code>Mode  </code>: {self.mode}"
         )
@@ -437,7 +437,7 @@ async def onUploadComplete(
         )
         msg_ = "\n\n<b><i>Link has been sent in your DM.</b></i>"
         if self.isLeech:
-            msg += f"\n<code>Files </code>: {folders}</blockquote>\n"
+            msg += f"\n<code>Files </code>: {folders}\n"
             if mime_type != 0:
                 msg += f"<code>Error </code>: {mime_type}\n"
             msg_ = "\n<b><i>Files has been sent in your DM.</b></i>"
@@ -537,7 +537,7 @@ async def onUploadComplete(
                             gmsg + msg + msg_
                         )
         else:
-            msg += f"\n<code>Type  </code>: {mime_type}</blockquote>"
+            msg += f"\n<code>Type  </code>: {mime_type}"
             if mime_type == "Folder":
                 msg += f"\n<code>Files </code>: {files}"
                 msg += f"\n<code>Folder</code>: {folders}"

diff --git a/bot/helper/listeners/ytdlp_listener.py b/bot/helper/listeners/ytdlp_listener.py
@@ -18,8 +18,8 @@
     sendMessage
 )
 
-from pyrogram.handlers import CallbackQueryHandler
-from pyrogram.filters import (
+from nekozee.handlers import CallbackQueryHandler
+from nekozee.filters import (
     regex,
     user
 )

diff --git a/bot/helper/task_utils/download_utils/jd_download.py b/bot/helper/task_utils/download_utils/jd_download.py
@@ -4,11 +4,11 @@
     wait_for,
 )
 from functools import partial
-from pyrogram.filters import (
+from nekozee.filters import (
     regex,
     user
 )
-from pyrogram.handlers import CallbackQueryHandler
+from nekozee.handlers import CallbackQueryHandler
 from time import time
 from aiofiles.os import path as aiopath
 from aiofiles import open as aiopen

diff --git a/bot/helper/task_utils/download_utils/telegram_download.py b/bot/helper/task_utils/download_utils/telegram_download.py
@@ -3,10 +3,7 @@
     sleep
 )
 from time import time
-from pyrogram.errors import (
-    FloodWait,
-    FloodPremiumWait
-)
+from nekozee.errors import FloodWait
 
 from bot import (
     config_dict,
@@ -98,11 +95,8 @@ async def _download(self, message, path):
             if self._listener.isCancelled:
                 await self._onDownloadError("Cancelled by user!")
                 return
-
-        except (
-            FloodWait,
-            FloodPremiumWait
-        ) as f:
+
+        except FloodWait as f:
             LOGGER.warning(str(f))
             await sleep(f.value) # type: ignore
         except Exception as e:

diff --git a/bot/helper/task_utils/gdrive_utils/list.py b/bot/helper/task_utils/gdrive_utils/list.py
@@ -7,11 +7,11 @@
 from functools import partial
 from logging import getLogger
 from natsort import natsorted
-from pyrogram.filters import (
+from nekozee.filters import (
     regex,
     user
 )
-from pyrogram.handlers import CallbackQueryHandler
+from nekozee.handlers import CallbackQueryHandler
 from tenacity import RetryError
 from time import time
 

diff --git a/bot/helper/task_utils/rclone_utils/list.py b/bot/helper/task_utils/rclone_utils/list.py
@@ -9,11 +9,11 @@
 from configparser import ConfigParser
 from functools import partial
 from json import loads
-from pyrogram.filters import (
+from nekozee.filters import (
     regex,
     user
 )
-from pyrogram.handlers import CallbackQueryHandler
+from nekozee.handlers import CallbackQueryHandler
 from time import time
 
 from bot import LOGGER, config_dict

diff --git a/bot/helper/task_utils/status_utils/aria2_status.py b/bot/helper/task_utils/status_utils/aria2_status.py
@@ -34,7 +34,7 @@ def __init__(
         self.queued = queued
         self.start_time = 0
         self.seeding = seeding
-        self.engine = f"Aria2 v{self._eng_ver()}"
+        self.engine = f"Aria2c v{self._eng_ver()}"
 
     def _eng_ver(self):
         return aria2.client.get_version()["version"]

diff --git a/bot/helper/task_utils/telegram_uploader.py b/bot/helper/task_utils/telegram_uploader.py
@@ -17,13 +17,11 @@
     walk,
     path as ospath
 )
-from pyrogram.errors import (
+from nekozee.errors import (
     FloodWait,
-    FloodPremiumWait,
-    RPCError,
-    SlowmodeWait
+    RPCError
 )
-from pyrogram.types import (
+from nekozee.types import (
     InputMediaVideo,
     InputMediaDocument,
     InputMediaPhoto
@@ -812,11 +810,7 @@ async def _upload_file(self, cap_mono, file, o_path, force_document=False):
                 and await aiopath.exists(thumb)
             ):
                 await remove(thumb)
-        except (
-            FloodWait,
-            FloodPremiumWait,
-            SlowmodeWait
-        ) as f:
+        except FloodWait as f:
             LOGGER.warning(str(f))
             await sleep(f.value * 1.3) # type: ignore
             if (

diff --git a/bot/helper/telegram_helper/button_build.py b/bot/helper/telegram_helper/button_build.py
@@ -1,4 +1,4 @@
-from pyrogram.types import (
+from nekozee.types import (
     InlineKeyboardMarkup,
     InlineKeyboardButton
 )

diff --git a/bot/helper/telegram_helper/filters.py b/bot/helper/telegram_helper/filters.py
@@ -1,4 +1,4 @@
-from pyrogram.filters import create
+from nekozee.filters import create
 
 from bot import user_data, OWNER_ID
 

diff --git a/bot/helper/telegram_helper/message_utils.py b/bot/helper/telegram_helper/message_utils.py
@@ -2,15 +2,14 @@
     sleep,
     create_task,
 )
-from pyrogram.errors import (
+from nekozee.errors import (
     FloodWait,
-    FloodPremiumWait,
     PeerIdInvalid,
     RPCError,
     UserNotParticipant,
 )
-from pyrogram.types import ChatPermissions
-from pyrogram.enums import ChatAction
+from nekozee.types import ChatPermissions
+from nekozee.enums import ChatAction
 from re import match as re_match
 from time import time
 from datetime import (
@@ -112,7 +111,7 @@ async def sendRss(text):
             disable_web_page_preview=True,
             disable_notification=True,
         )
-    except (FloodWait, FloodPremiumWait) as f:
+    except FloodWait as f:
         LOGGER.warning(str(f))
         await sleep(f.value * 1.2) # type: ignore
         return await sendRss(text)
@@ -517,8 +516,8 @@ async def forcesub(message, ids, button=None):
             continue
         try:
             chat = await message._client.get_chat(channel_id)
-        except PeerIdInvalid as e:
-            LOGGER.error(f"{e.NAME}: {e.MESSAGE} for {channel_id}")
+        except (PeerIdInvalid, RPCError) as e:
+            LOGGER.error(f"{e.NAME}: {e.MESSAGE} for {channel_id}. Mostly I'm not added in the channel as admin.")
             continue
         try:
             await chat.get_member(message.from_user.id)

diff --git a/bot/modules/anonymous.py b/bot/modules/anonymous.py
@@ -1,5 +1,5 @@
-from pyrogram.filters import regex
-from pyrogram.handlers import CallbackQueryHandler
+from nekozee.filters import regex
+from nekozee.handlers import CallbackQueryHandler
 
 from bot import (
     bot,

diff --git a/bot/modules/authorize.py b/bot/modules/authorize.py
@@ -1,5 +1,5 @@
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 
 from bot import (
     user_data,

diff --git a/bot/modules/bot_settings.py b/bot/modules/bot_settings.py
@@ -18,12 +18,12 @@
     getcwd
 )
 
-from pyrogram import filters
-from pyrogram.handlers import (
+from nekozee import filters
+from nekozee.handlers import (
     MessageHandler,
     CallbackQueryHandler
 )
-from pyrogram.errors import (
+from nekozee.errors import (
     ListenerTimeout,
     ListenerStopped
 )

diff --git a/bot/modules/cancel_task.py b/bot/modules/cancel_task.py
@@ -1,10 +1,10 @@
 from asyncio import sleep
 from re import search as re_search
-from pyrogram.filters import (
+from nekozee.filters import (
     command,
     regex
 )
-from pyrogram.handlers import (
+from nekozee.handlers import (
     MessageHandler,
     CallbackQueryHandler
 )

diff --git a/bot/modules/clone.py b/bot/modules/clone.py
@@ -1,7 +1,7 @@
 from asyncio import gather
 from json import loads
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 from secrets import token_urlsafe
 
 from bot import (

diff --git a/bot/modules/exec.py b/bot/modules/exec.py
@@ -6,8 +6,8 @@
     getcwd,
     chdir
 )
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 from textwrap import indent
 from traceback import format_exc
 

diff --git a/bot/modules/file_selector.py b/bot/modules/file_selector.py
@@ -2,11 +2,11 @@
     remove,
     path as aiopath
 )
-from pyrogram.filters import (
+from nekozee.filters import (
     command,
     regex
 )
-from pyrogram.handlers import (
+from nekozee.handlers import (
     MessageHandler,
     CallbackQueryHandler
 )

diff --git a/bot/modules/force_start.py b/bot/modules/force_start.py
@@ -1,5 +1,5 @@
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 
 from bot import (
     task_dict,

diff --git a/bot/modules/gd_count.py b/bot/modules/gd_count.py
@@ -1,5 +1,5 @@
-from pyrogram.filters import command
-from pyrogram.handlers import MessageHandler
+from nekozee.filters import command
+from nekozee.handlers import MessageHandler
 
 from bot import bot
 from bot.helper.ext_utils.bot_utils import sync_to_async