Update bot.py

bot.py

@@ -1,14 +1,13 @@
-# bot.py
-
 import asyncio
 import logging
 import os
 import re
 import uuid
+import time
 from typing import Dict
 
-from aiogram import Bot, Dispatcher, F
-from aiogram.filters import CommandStart
+from aiogram import Bot, Dispatcher, types, F
+from aiogram.filters import CommandStart, Command
 from aiogram.types import Message, FSInputFile
 from aiogram.enums import ParseMode
 from aiogram.exceptions import TelegramBadRequest
@@ -43,6 +42,7 @@ bot = Bot(
 dp = Dispatcher()
 TASK_QUEUE = asyncio.Queue()
 BATCH_JOBS: Dict[str, Dict] = {}
+BOT_START_TIME = time.time()
 
 # --- Worker Logic ---
 async def link_processor_worker(worker_id: int):
@@ -74,9 +74,6 @@ async def link_processor_worker(worker_id: int):
                     raise ValueError(error)
 
                 local_filepath, thumb_path, download_error = await terabox.download_terabox_file(
-                    bot,
-                    batch_info["source_chat_id"],
-                    batch_info["status_message"].message_id,
                     download_url,
                     raw_filename
                 )
@@ -103,10 +100,12 @@ async def link_processor_worker(worker_id: int):
                 batch_info["failed_links"].append({"link": original_link, "error": error_msg})
 
             processed, total = batch_info['processed_links'], batch_info['total_links']
+            eta_sec = ((time.time() - batch_info['start_time']) / processed) * (total - processed) if processed > 0 else 0
+
             try:
                 await batch_info["status_message"].edit_text(
-                    f"⚙️ Batch <code>{batch_id[:6]}</code> in progress...\n"
-                    f"Processed <b>{processed}</b>/<b>{total}</b> links."
+                    f"<b>🔧 Batch `{batch_id[:6]}` in progress...</b>\n"
+                    f"Processed: {processed}/{total} | ETA: {int(eta_sec)} sec"
                 )
             except TelegramBadRequest:
                 pass
@@ -117,7 +116,7 @@ async def link_processor_worker(worker_id: int):
 
         TASK_QUEUE.task_done()
 
-async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Message:
+async def send_and_cache_file(chat_id: int, file_info: dict, caption: str, reply_to: int) -> Message:
     file_path_or_id = file_info.get('file_id') or FSInputFile(file_info['path'], filename=file_info['name'])
     media_type = file_info.get('type')
     filename = file_info.get('name') or file_info.get('filename')
@@ -127,13 +126,13 @@ async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> Me
 
     sent_message = None
     if media_type == 'video' or filename.lower().endswith(video_exts):
-        sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True)
+        sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True, reply_to_message_id=reply_to)
         media_type = 'video'
     elif media_type == 'audio' or filename.lower().endswith(audio_exts):
-        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption)
+        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
         media_type = 'audio'
     else:
-        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption)
+        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
         media_type = 'document'
 
     if not file_info.get('cached') and sent_message:
@@ -155,15 +154,15 @@ async def handle_batch_completion(batch_id: str):
     try:
         if not successful_downloads:
             failed_links_text = "\n".join(
-                [f"- {x['link']} → {x['error']}" for x in batch['failed_links']]
+                [f"- {x['link']} \u2192 {x['error']}" for x in batch['failed_links']]
             )
             await status_msg.edit_text(
-                f"❌ Batch <code>{batch_id[:6]}</code> failed.\nNo files could be processed.\n\n<b>Details:</b>\n{failed_links_text}"
+                f"<b>❌ Batch `{batch_id[:6]}` failed. No files could be processed.</b>\nDetails:\n{failed_links_text}"
             )
             return
 
         await status_msg.edit_text(
-            f"✅ Batch <code>{batch_id[:6]}</code> downloaded.\nPreparing to send <b>{len(successful_downloads)}</b> files..."
+            f"📥 Batch `{batch_id[:6]}` downloaded. Preparing to send {len(successful_downloads)} files..."
         )
 
         if config.FORWARD_CHANNEL_ID:
@@ -174,14 +173,14 @@ async def handle_batch_completion(batch_id: str):
             )
             for item in successful_downloads:
                 caption = f"`{item.get('name') or item.get('filename')}`"
-                await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, caption)
+                await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, caption, reply_to=None)
                 await asyncio.sleep(1)
 
         for item in successful_downloads:
             caption = f"`{item.get('name') or item.get('filename')}`"
-            await send_and_cache_file(batch["source_chat_id"], item, caption)
+            await send_and_cache_file(batch["source_chat_id"], item, caption, reply_to=batch['source_message_id'])
 
-        summary = f"✅ Batch <code>{batch_id[:6]}</code> complete: <b>{len(successful_downloads)}</b> files sent."
+        summary = f"✅ Batch `{batch_id[:6]}` complete: {len(successful_downloads)} files sent."
         if batch["failed_links"]:
             summary += f"\n❌ {len(batch['failed_links'])} links failed."
 
@@ -190,7 +189,7 @@ async def handle_batch_completion(batch_id: str):
     except Exception as e:
         logger.error(f"Error during batch completion for {batch_id}: {e}", exc_info=True)
         await status_msg.edit_text(
-            f"❌ Critical error occurred while sending files for batch <code>{batch_id[:6]}</code>."
+            f"A critical error occurred while sending files for batch `{batch_id[:6]}`."
         )
     finally:
         for item in successful_downloads:
@@ -206,12 +205,35 @@ async def handle_batch_completion(batch_id: str):
 async def start_handler(message: Message):
     text = (
         "👋 <b>Welcome to the Terabox Downloader Bot!</b>\n\n"
-        "📥 Send me any valid Terabox link(s) and I will fetch the files and send them to you.\n\n"
-        f"📢 Make sure you are a member of @{config.FORCE_SUB_CHANNEL_USERNAME}\n\n"
-        "🚀 Supports multiple links per message (batch mode).\n"
-        "💾 Auto-cache enabled.\n"
-        "🔄 Forwarding original message to channel enabled.\n\n"
-        "✅ <i>Just send your links below ⬇️</i>"
+        "📥 Send me any valid Terabox link (supports multi-link batch).\n\n"
+        f"📢 Make sure you are a member of: @{config.FORCE_SUB_CHANNEL_USERNAME}\n\n"
+        "🚀 Features:\n"
+        "- Multi batch link\n"
+        "- Auto cache\n"
+        "- Progress bar + ETA\n"
+        "- No ffmpeg re-encode\n"
+        "- Auto forward\n"
+        "\n✅ <i>Send links below:</i>"
+    )
+    await message.reply(text)
+
+@dp.message(Command("admin"))
+async def admin_handler(message: Message):
+    if message.from_user.id != config.OWNER_ID:
+        return
+
+    users = await db_utils.get_all_active_user_ids_db()
+    uptime_sec = int(time.time() - BOT_START_TIME)
+
+    text = (
+        f"📅 <b>Admin Panel</b>\n\n"
+        f"🕰 Uptime: {uptime_sec} sec\n"
+        f"📊 Total users: {len(users)}\n"
+        f"🔢 Queue size: {TASK_QUEUE.qsize()}\n"
+        f"🔧 Workers: {config.CONCURRENT_WORKERS}\n"
+        f"📁 Forward Channel: {config.FORWARD_CHANNEL_ID}\n"
+        f"📢 Force Sub Channel: @{config.FORCE_SUB_CHANNEL_USERNAME}\n"
+        f"👨‍📡 Worker URL: {config.TERABOX_WORKER_URL}"
     )
     await message.reply(text)
 
@@ -226,7 +248,7 @@ async def message_handler(message: Message):
         message.from_user.first_name
     )
 
-    links = list(set(re.findall(r'https?://[^\s<>"\']+', message.text or message.caption or "")))
+    links = list(set(re.findall(r'https?://[^\s<>"]+', message.text or message.caption or "")))
     terabox_links = [link for link in links if any(domain in link for domain in [
         "terabox.com", "teraboxapp.com", "terasharelink.com", "1024tera.com",
         "freeterabox.com", "4funbox.com", "box-links.com"
@@ -237,7 +259,8 @@ async def message_handler(message: Message):
 
     batch_id = str(uuid.uuid4())
     status_msg = await message.reply(
-        f"✅ <b>Found</b> {len(terabox_links)} links.\n<b>Queued</b> as batch <code>{batch_id[:6]}</code>."
+        f"✅ Found {len(terabox_links)} links. Queued as batch `{batch_id[:6]}`.",
+        reply_to_message_id=message.message_id
     )
 
     BATCH_JOBS[batch_id] = {
@@ -249,7 +272,8 @@ async def message_handler(message: Message):
         "source_user_id": message.from_user.id,
         "source_message_id": message.message_id,
         "status_message": status_msg,
-        "lock": asyncio.Lock()
+        "lock": asyncio.Lock(),
+        "start_time": time.time()
     }
 
     for link in terabox_links:
@@ -266,4 +290,5 @@ def start_bot():
     dp.startup.register(on_startup)
     dp.message.register(message_handler)
     dp.message.register(start_handler, CommandStart())
-    return dp, bot
+    dp.message.register(admin_handler, Command("admin"))
+    return dp, bot