Replace yt-dlp with own downloader based on

.env.example

@@ -16,6 +16,9 @@ DAILY_STATS_MESSAGE_ID=24
 BOTSTAT=abcdefg12345
 MONETAG_URL=https://example.com/your-monetag-link/
 
+# Logging settings (optional)
+# LOG_LEVEL=INFO  # Options: DEBUG, INFO, WARNING, ERROR, CRITICAL
+
 # yt-dlp settings (optional)
 # YTDLP_COOKIES=cookies.txt
 

.gitignore

@@ -9,6 +9,7 @@ config.ini
 sqlite*.db
 LICENSE.md
 cookies.txt
+proxies.txt
 
 #extensions
 *.log

data/config.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import os
 from json import loads as json_loads
 from pathlib import Path
@@ -44,6 +45,21 @@ def _parse_json_list(key: str) -> list[int]:
         return []
 
 
+def _parse_log_level(key: str, default: str = "INFO") -> int:
+    """Parse an environment variable as a logging level, returning default if unset/invalid."""
+    level_map = {
+        "DEBUG": logging.DEBUG,
+        "INFO": logging.INFO,
+        "WARNING": logging.WARNING,
+        "ERROR": logging.ERROR,
+        "CRITICAL": logging.CRITICAL,
+    }
+
+    default_level = level_map.get(default.upper().strip(), logging.INFO)
+    value = os.getenv(key, default).upper().strip()
+    return level_map.get(value, default_level)
+
+
 class BotConfig(TypedDict):
     """Type definition for bot configuration."""
 
@@ -103,6 +119,18 @@ class PerformanceConfig(TypedDict):
     max_video_duration: int  # Maximum video duration in seconds (0 = no limit)
 
 
+class TikTokConfig(TypedDict):
+    """Type definition for TikTok extraction configuration."""
+
+    cookies_file: str  # Path to Netscape-format cookies file (optional)
+
+
+class LoggingConfig(TypedDict):
+    """Type definition for logging configuration."""
+
+    log_level: int  # Logging level (e.g., logging.INFO, logging.DEBUG)
+
+
 class Config(TypedDict):
     """Type definition for the main configuration."""
 
@@ -112,6 +140,8 @@ class Config(TypedDict):
     queue: QueueConfig
     proxy: ProxyConfig
     performance: PerformanceConfig
+    tiktok: TikTokConfig
+    logging: LoggingConfig
 
 
 config: Config = {
@@ -159,6 +189,12 @@ class Config(TypedDict):
         ),
         "max_video_duration": _parse_int_env("MAX_VIDEO_DURATION", 1800),  # 30 minutes
     },
+    "tiktok": {
+        "cookies_file": os.getenv("YTDLP_COOKIES", ""),
+    },
+    "logging": {
+        "log_level": _parse_log_level("LOG_LEVEL", "INFO"),
+    },
 }
 
 admin_ids: list[int] = config["bot"]["admin_ids"]

data/loader.py

@@ -11,21 +11,32 @@
 from data.config import config
 from data.database import init_db, initialize_database_components
 
-logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)-5.5s]  %(message)s",
-                    handlers=[
-                        # logging.FileHandler("bot.log"),
-                        logging.StreamHandler()
-                    ])
-logging.getLogger('apscheduler.executors.default').setLevel(logging.WARNING)
-logging.getLogger('apscheduler.scheduler').propagate = False
-logging.getLogger('aiogram').setLevel(logging.WARNING)
-
-local_server = AiohttpSession(api=TelegramAPIServer.from_base(config["bot"]["tg_server"]))
-bot = Bot(token=config["bot"]["token"], session=local_server, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
+logging.basicConfig(
+    level=config["logging"]["log_level"],
+    format="%(asctime)s [%(levelname)-5.5s]  %(message)s",
+    handlers=[
+        # logging.FileHandler("bot.log"),
+        logging.StreamHandler()
+    ],
+)
+logging.getLogger("apscheduler.executors.default").setLevel(logging.WARNING)
+logging.getLogger("apscheduler.scheduler").propagate = False
+logging.getLogger("aiogram").setLevel(logging.WARNING)
+
+local_server = AiohttpSession(
+    api=TelegramAPIServer.from_base(config["bot"]["tg_server"])
+)
+bot = Bot(
+    token=config["bot"]["token"],
+    session=local_server,
+    default=DefaultBotProperties(parse_mode=ParseMode.HTML),
+)
 
 dp = Dispatcher(storage=MemoryStorage())
 
-scheduler = AsyncIOScheduler(timezone="America/Los_Angeles", job_defaults={"coalesce": True})
+scheduler = AsyncIOScheduler(
+    timezone="America/Los_Angeles", job_defaults={"coalesce": True}
+)
 
 
 async def setup_db(db_url: str):

data/locale/ar.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>تم حذف هذا الفيديو من قبل المنشئ.</b>",
   "error_private": "<b>هذا الفيديو خاص ولا يمكن الوصول إليه.</b>",
   "error_region": "<b>هذا الفيديو غير متوفر في منطقتك.</b>",
+  "error_invalid_link": "<b>رابط الفيديو غير صالح.</b>\nيرجى التحقق من الرابط والمحاولة مرة أخرى.",
   "error_network": "<b>حدث خطأ في الشبكة.</b>\nيرجى المحاولة مرة أخرى.",
   "error_rate_limit": "<b>طلبات كثيرة جدًا.</b>\nيرجى الانتظار قليلاً والمحاولة مرة أخرى.",
   "error_too_long": "<b>هذا الفيديو طويل جدًا.</b>\nالحد الأقصى المسموح به هو 30 دقيقة.",

data/locale/en.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>This video has been deleted by the creator.</b>",
   "error_private": "<b>This video is private and cannot be accessed.</b>",
   "error_region": "<b>This video is not available in your region.</b>",
+  "error_invalid_link": "<b>Invalid video link.</b>\nPlease check the link and try again.",
   "error_network": "<b>Network error occurred.</b>\nPlease try again.",
   "error_rate_limit": "<b>Too many requests.</b>\nPlease wait a moment and try again.",
   "error_too_long": "<b>This video is too long.</b>\nMaximum allowed duration is 30 minutes.",

data/locale/hi.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>यह वीडियो निर्माता द्वारा हटा दिया गया है।</b>",
   "error_private": "<b>यह वीडियो निजी है और एक्सेस नहीं किया जा सकता।</b>",
   "error_region": "<b>यह वीडियो आपके क्षेत्र में उपलब्ध नहीं है।</b>",
+  "error_invalid_link": "<b>अमान्य वीडियो लिंक।</b>\nकृपया लिंक जांचें और फिर से प्रयास करें।",
   "error_network": "<b>नेटवर्क त्रुटि हुई।</b>\nकृपया फिर से प्रयास करें।",
   "error_rate_limit": "<b>बहुत अधिक अनुरोध।</b>\nकृपया कुछ देर प्रतीक्षा करें और फिर से प्रयास करें।",
   "error_too_long": "<b>यह वीडियो बहुत लंबा है।</b>\nअधिकतम अनुमत अवधि 30 मिनट है।",

data/locale/id.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>Video ini sudah dihapus oleh pembuatnya.</b>",
   "error_private": "<b>Video ini privat dan tidak bisa diakses.</b>",
   "error_region": "<b>Video ini tidak tersedia di wilayahmu.</b>",
+  "error_invalid_link": "<b>Tautan video tidak valid.</b>\nSilakan periksa tautan dan coba lagi.",
   "error_network": "<b>Terjadi kesalahan jaringan.</b>\nSilakan coba lagi.",
   "error_rate_limit": "<b>Terlalu banyak permintaan.</b>\nSilakan tunggu sebentar dan coba lagi.",
   "error_too_long": "<b>Video ini terlalu panjang.</b>\nDurasi maksimum yang diizinkan adalah 30 menit.",

data/locale/ru.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>Это видео было удалено автором.</b>",
   "error_private": "<b>Это видео приватное и недоступно.</b>",
   "error_region": "<b>Это видео недоступно в вашем регионе.</b>",
+  "error_invalid_link": "<b>Неверная ссылка на видео.</b>\nПожалуйста, проверьте ссылку и попробуйте снова.",
   "error_network": "<b>Произошла сетевая ошибка.</b>\nПожалуйста, попробуйте снова.",
   "error_rate_limit": "<b>Слишком много запросов.</b>\nПожалуйста, подождите немного и попробуйте снова.",
   "error_too_long": "<b>Это видео слишком длинное.</b>\nМаксимальная продолжительность — 30 минут.",

data/locale/so.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>Fiidiyowgan waxaa tirtiray abuurahiisa.</b>",
   "error_private": "<b>Fiidiyowgan waa qarsoon yahay mana la heli karo.</b>",
   "error_region": "<b>Fiidiyowgan laguma heli karo aagaaga.</b>",
+  "error_invalid_link": "<b>Link-a fiidiyowgu ma shaqeynayo.</b>\nFadlan hubi link-a oo isku day mar kale.",
   "error_network": "<b>Khalad shabakad ayaa dhacay.</b>\nFadlan isku day mar kale.",
   "error_rate_limit": "<b>Codsiyo badan ayaa la sameeyay.</b>\nFadlan sug wakhti yar oo isku day mar kale.",
   "error_too_long": "<b>Fiidiyowgan waa dheer yahay.</b>\nMudda ugu badan ee la ogol yahay waa 30 daqiiqo.",

data/locale/uk.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>Це відео було видалено автором.</b>",
   "error_private": "<b>Це відео приватне і недоступне.</b>",
   "error_region": "<b>Це відео недоступне у вашому регіоні.</b>",
+  "error_invalid_link": "<b>Невірне посилання на відео.</b>\nБудь ласка, перевірте посилання та спробуйте ще раз.",
   "error_network": "<b>Сталася мережева помилка.</b>\nБудь ласка, спробуйте ще раз.",
   "error_rate_limit": "<b>Занадто багато запитів.</b>\nБудь ласка, зачекайте трохи і спробуйте знову.",
   "error_too_long": "<b>Це відео занадто довге.</b>\nМаксимальна тривалість — 30 хвилин.",

data/locale/vi.json

@@ -38,6 +38,7 @@
   "error_deleted": "<b>Video này đã bị người tạo xóa.</b>",
   "error_private": "<b>Video này ở chế độ riêng tư và không thể truy cập.</b>",
   "error_region": "<b>Video này không khả dụng ở khu vực của bạn.</b>",
+  "error_invalid_link": "<b>Liên kết video không hợp lệ.</b>\nVui lòng kiểm tra liên kết và thử lại.",
   "error_network": "<b>Đã xảy ra lỗi mạng.</b>\nVui lòng thử lại.",
   "error_rate_limit": "<b>Quá nhiều yêu cầu.</b>\nVui lòng đợi một chút và thử lại.",
   "error_too_long": "<b>Video này quá dài.</b>\nThời lượng tối đa cho phép là 30 phút.",

handlers/get_inline.py

@@ -129,9 +129,9 @@ async def update_inline_status(attempt: int):
         await asyncio.sleep(0.5)
 
     try:
-        # Use queue with bypass_user_limit=True for inline downloads
-        # Inline downloads bypass the per-user queue limit
-        async with queue.info_queue(user_id, bypass_user_limit=True) as acquired:
+        # Use queue with bypass=True for inline downloads
+        # Inline downloads bypass the per-user queue entirely
+        async with queue.user_queue(user_id, bypass=True) as acquired:
             if not acquired:
                 # This shouldn't happen with bypass, but handle anyway
                 await bot.edit_message_text(
@@ -148,8 +148,6 @@ async def update_inline_status(attempt: int):
             )
 
         if video_info.is_slideshow:  # Process image
-            # Clean up resources before returning (close YDL context)
-            video_info.close()
             return await bot.edit_message_text(
                 inline_message_id=message_id, text=locale[lang]["only_video_supported"]
             )
@@ -170,10 +168,6 @@ async def update_inline_status(attempt: int):
                 full_name=full_name,
             )
 
-        # Clean up video_info resources (videos already closed in video() method,
-        # but call close() for safety - it's idempotent)
-        video_info.close()
-
         try:  # Try to write log into database
             # Write log into database
             await add_video(

handlers/get_video.py

@@ -2,7 +2,7 @@
 
 from aiogram import Router, F
 from aiogram.exceptions import TelegramBadRequest
-from aiogram.types import Message, ReactionTypeEmoji, CallbackQuery
+from aiogram.types import Message, ReactionTypeEmoji
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from data.config import locale, second_ids, monetag_url, config
@@ -25,19 +25,6 @@
 # Note: Must use valid Telegram reaction emojis (🔄 and ⏳ are not valid)
 RETRY_EMOJIS = ["👀", "🤔", "🙏"]
 
-# Callback data prefix for retry button
-RETRY_CALLBACK_PREFIX = "retry_video"
-
-
-def try_again_button(lang: str):
-    """Create a 'Try Again' button for queue full error."""
-    keyb = InlineKeyboardBuilder()
-    keyb.button(
-        text=locale[lang]["try_again_button"],
-        callback_data=RETRY_CALLBACK_PREFIX,
-    )
-    return keyb.as_markup()
-
 
 @video_router.message(F.text)
 async def send_tiktok_video(message: Message):
@@ -63,12 +50,12 @@ async def send_tiktok_video(message: Message):
     else:  # Set lang and file mode if in DB
         lang, file_mode = settings
 
-    # Get queue manager and retry config
+    # Get queue manager
     queue = QueueManager.get_instance()
     retry_config = config["queue"]
 
     try:
-        # Check if link is valid
+        # Check if link is valid (BEFORE queue - quick check)
         video_link, is_mobile = await api.regex_check(message.text)
         # If not valid
         if video_link is None:
@@ -77,13 +64,16 @@ async def send_tiktok_video(message: Message):
                 await message.reply(locale[lang]["link_error"])
             return
 
-        # Check per-user queue limit before proceeding
-        user_queue_count = queue.get_user_queue_count(message.chat.id)
-        if user_queue_count >= retry_config["max_user_queue_size"]:
+        # Check queue limit BEFORE showing reaction
+        if (
+            queue.get_user_queue_count(message.chat.id)
+            >= retry_config["max_user_queue_size"]
+        ):
             if not group_chat:
                 await message.reply(
-                    locale[lang]["error_queue_full"].format(user_queue_count),
-                    reply_markup=try_again_button(lang),
+                    locale[lang]["error_queue_full"].format(
+                        queue.get_user_queue_count(message.chat.id)
+                    )
                 )
             return
 
@@ -114,18 +104,22 @@ async def update_retry_status(attempt: int):
             except Exception as e:
                 logging.warning(f"Failed to update retry emoji to {emoji}: {e}")
 
-        # Acquire info queue slot with per-user limit
-        async with queue.info_queue(message.chat.id) as acquired:
+        # ENTIRE operation inside queue - waits silently for turn
+        async with queue.user_queue(message.chat.id) as acquired:
             if not acquired:
-                # User limit exceeded (shouldn't happen due to pre-check, but handle anyway)
+                # Queue full (race condition - another request got in first)
                 if status_message:
                     await status_message.delete()
+                else:
+                    try:
+                        await message.react([])
+                    except TelegramBadRequest:
+                        pass
                 if not group_chat:
                     await message.reply(
                         locale[lang]["error_queue_full"].format(
                             queue.get_user_queue_count(message.chat.id)
-                        ),
-                        reply_markup=try_again_button(lang),
+                        )
                     )
                 return
 
@@ -150,19 +144,16 @@ async def update_retry_status(attempt: int):
                     await message.reply(get_error_message(e, lang))
                 return
 
-        # Successfully got video info - show processing emoji
-        if not status_message:
-            try:
-                await message.react(
-                    [ReactionTypeEmoji(emoji="👨‍💻")], disable_notification=True
-                )
-            except TelegramBadRequest:
-                logging.debug("Failed to set processing reaction")
+            # Successfully got video info - show processing emoji
+            if not status_message:
+                try:
+                    await message.react(
+                        [ReactionTypeEmoji(emoji="👨‍💻")], disable_notification=True
+                    )
+                except TelegramBadRequest:
+                    logging.debug("Failed to set processing reaction")
 
-        # Use try/finally to ensure video_info resources are cleaned up
-        # (especially download context for slideshows)
-        try:
-            # Send video/images (no global send queue - per-user limit only)
+            # Send video/images (INSIDE queue - next request waits)
             if video_info.is_slideshow:  # Process images
                 # Send upload image action
                 await bot.send_chat_action(
@@ -260,9 +251,6 @@ async def update_retry_status(attempt: int):
             except Exception as e:
                 logging.error("Can't write into database")
                 logging.error(e)
-        finally:
-            # Clean up video_info resources (closes YDL context for slideshows)
-            video_info.close()
 
     except Exception as e:  # If something went wrong
         error_text = error_catch(e)
@@ -283,32 +271,3 @@ async def update_retry_status(attempt: int):
             logging.debug("Failed to update UI during error cleanup")
         except Exception as cleanup_err:
             logging.warning(f"Unexpected error during cleanup: {cleanup_err}")
-
-
-@video_router.callback_query(F.data == RETRY_CALLBACK_PREFIX)
-async def handle_retry_callback(callback: CallbackQuery):
-    """Handle 'Try Again' button click for queue full error."""
-    # Ensure callback.message exists and is accessible
-    if not callback.message or not hasattr(callback.message, "reply_to_message"):
-        await callback.answer("Message not accessible", show_alert=True)
-        return
-
-    # Get the original message that contains the TikTok link
-    original_message = callback.message.reply_to_message
-
-    if not original_message or not original_message.text:
-        await callback.answer("Original message not found", show_alert=True)
-        return
-
-    # Delete the error message with the button
-    try:
-        if hasattr(callback.message, "delete"):
-            await callback.message.delete()
-    except TelegramBadRequest:
-        logging.debug("Retry button message already deleted")
-
-    # Answer the callback to remove loading state
-    await callback.answer()
-
-    # Re-process the original message
-    await send_tiktok_video(original_message)