Merge pull request #386

v7.5

Author: Michele0303

.gitignore

@@ -131,8 +131,6 @@ dmypy.json
 # video file extensions
 *.mp4
 *.flv
-cookies.json
-telegram.json
 
 # telegram session file
 *.session

src/cookies.json

@@ -0,0 +1,4 @@
+{
+  "sessionid_ss": "",
+  "tt-target-idc": "useast2a"
+}

src/requirements-dev.txt

@@ -0,0 +1,2 @@
+ruff~=0.12.0
+pre-commit~=4.3.0

src/requirements.txt

@@ -1,8 +1,6 @@
 argparse~=1.4.0
 ffmpeg-python~=0.2.0
-Pyrogram~=2.0.0
+telethon~=1.42.0
 distro~=1.9.0
 curl_cffi~=0.12.0
 requests~=2.32.0
-ruff~=0.12.0
-pre-commit~=4.3.0

src/telegram.json

@@ -1,6 +1,5 @@
 {
     "api_id": "",
     "api_hash": "",
-    "bot_token": "",
-    "chat_id": 1110107842
+    "chat_id": "me"
 }

src/upload/telegram.py

@@ -1,7 +1,7 @@
+import asyncio
 from pathlib import Path
 
-from pyrogram import Client
-from pyrogram.enums import ParseMode
+from telethon import TelegramClient
 
 from utils.logger_manager import logger
 from utils.utils import read_telegram_config
@@ -17,58 +17,71 @@ def __init__(self):
 
         self.api_id = config["api_id"]
         self.api_hash = config["api_hash"]
-        self.bot_token = config["bot_token"]
         self.chat_id = config["chat_id"]
 
-        self.app = Client(
-            "telegram_session",
+        self.client = TelegramClient(
+            "tiktok_live_recorder_session",
             api_id=self.api_id,
             api_hash=self.api_hash,
-            bot_token=self.bot_token,
         )
 
     def upload(self, file_path: str):
         """
-        Upload a file to the bot's own chat (saved messages).
+        Upload a file to the user's Saved Messages via Telethon.
         """
-        try:
-            self.app.start()
-
-            me = self.app.get_me()
-            is_premium = me.is_premium
-            max_size = (
-                PREMIUM_USER_MAX_FILE_SIZE if is_premium else FREE_USER_MAX_FILE_SIZE
-            )
-
-            file_size = Path(file_path).stat().st_size
-            logger.info(
-                f"File to upload: {Path(file_path).name} "
-                f"({round(file_size / (1024 * 1024))} MB)"
-            )
-
-            if file_size > max_size:
-                logger.warning(
-                    "The file is too large to be uploaded with this type of account."
+
+        async def _upload():
+            try:
+                await self.client.connect()
+
+                if not await self.client.is_user_authorized():
+                    await self.client.start()
+
+                me = await self.client.get_me()
+                is_premium = me.premium
+                max_size = (
+                    PREMIUM_USER_MAX_FILE_SIZE
+                    if is_premium
+                    else FREE_USER_MAX_FILE_SIZE
+                )
+
+                file_size = Path(file_path).stat().st_size
+                logger.info(
+                    f"File to upload: {Path(file_path).name} "
+                    f"({round(file_size / (1024 * 1024))} MB)"
+                )
+
+                if file_size > max_size:
+                    logger.warning(
+                        "The file is too large to be uploaded "
+                        "with this type of account."
+                    )
+                    return
+
+                logger.info(
+                    "Uploading video on Telegram... "
+                    "This may take a while depending on file size."
+                )
+
+                await self.client.send_file(
+                    entity=self.chat_id,
+                    file=file_path,
+                    caption=(
+                        "🎥 <b>Video recorded via "
+                        '<a href="https://github.com/Michele0303/'
+                        'tiktok-live-recorder">'
+                        "TikTok Live Recorder</a></b>"
+                    ),
+                    parse_mode="html",
+                    force_document=True,
                 )
-                return
-
-            logger.info(
-                "Uploading video on Telegram... This may take a while depending on the file size."
-            )
-            self.app.send_document(
-                chat_id=self.chat_id,
-                document=file_path,
-                caption=(
-                    '🎥 <b>Video recorded via <a href="https://github.com/Michele0303/tiktok-live-recorder">'
-                    "TikTok Live Recorder</a></b>"
-                ),
-                parse_mode=ParseMode.HTML,
-                force_document=True,
-            )
-            logger.info("File successfully uploaded to Telegram.\n")
-
-        except Exception as e:
-            logger.error(f"Error during Telegram upload: {e}\n")
-
-        finally:
-            self.app.stop()
+
+                logger.info("File successfully uploaded to Telegram.\n")
+
+            except Exception as e:
+                logger.error(f"Error during Telegram upload: {e}\n")
+
+            finally:
+                await self.client.disconnect()
+
+        asyncio.run(_upload())

src/utils/dependencies.py

@@ -120,15 +120,15 @@ def check_requests_library():
         return False
 
 
-def check_pyrogram_library():
+def check_telethon_library():
     try:
-        import pyrogram
+        import telethon
 
-        _ = pyrogram  # to avoid linting issues
+        _ = telethon  # to avoid linting issues
 
         return True
     except ModuleNotFoundError:
-        logger.error("pyrogram library is not installed")
+        logger.error("telethon library is not installed")
         return False
 
 
@@ -162,7 +162,7 @@ def check_and_install_dependencies():
         check_argparse_library(),
         check_curl_cffi_library(),
         check_requests_library(),
-        check_pyrogram_library(),
+        check_telethon_library(),
         check_ffmpeg_binary(),
     ]
 

src/utils/enums.py

@@ -118,9 +118,13 @@ def __str__(self):
     def __iter__(self):
         return iter(self.value)
 
-    NEW_FEATURES = ["Fixed followers mode", "Minor"]
+    NEW_FEATURES = [
+        "Replaced pyrogram to telethon library.",
+        "Fixed termux dependencies error.",
+        "Minor.",
+    ]
 
-    VERSION = 7.4
+    VERSION = 7.5
     BANNER = rf"""
 
   _____ _ _   _____    _     _    _           ___                   _