Update bot.py

bot.py

@@ -1,3 +1,5 @@
+# bot.py
+
 import asyncio
 import logging
 import os
@@ -7,7 +9,7 @@ import time
 from typing import Dict
 
 from aiogram import Bot, Dispatcher, types, F
-from aiogram.filters import CommandStart, Command
+from aiogram.filters import CommandStart
 from aiogram.types import Message, FSInputFile
 from aiogram.enums import ParseMode
 from aiogram.exceptions import TelegramBadRequest
@@ -42,7 +44,6 @@ 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):
@@ -73,10 +74,7 @@ async def link_processor_worker(worker_id: int):
                 if error:
                     raise ValueError(error)
 
-                local_filepath, thumb_path, download_error = await terabox.download_terabox_file(
-                    download_url,
-                    raw_filename
-                )
+                local_filepath, download_error = await terabox.download_terabox_file(download_url, raw_filename)
                 if download_error:
                     raise ValueError(download_error)
 
@@ -85,8 +83,7 @@ async def link_processor_worker(worker_id: int):
                     'path': local_filepath,
                     'name': raw_filename,
                     'size': os.path.getsize(local_filepath),
-                    'short_id': short_id,
-                    'thumb': thumb_path
+                    'short_id': short_id
                 }
 
         except Exception as e:
@@ -100,12 +97,18 @@ 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
+
+            eta_sec = max(1, int((time.time() - batch_info["start_time"]) / processed * (total - processed)))
 
             try:
-                await batch_info["status_message"].edit_text(
-                    f"<b>🔧 Batch `{batch_id[:6]}` in progress...</b>\n"
-                    f"Processed: {processed}/{total} | ETA: {int(eta_sec)} sec"
+                await bot.edit_message_text(
+                    chat_id=batch_info["source_chat_id"],
+                    message_id=batch_info["status_message_id"],
+                    text=(
+                        f"⚙️ Batch <code>{batch_id[:6]}</code> in progress... "
+                        f"{processed}/{total} links processed.\n"
+                        f"⏳ ETA: ~{eta_sec}s"
+                    )
                 )
             except TelegramBadRequest:
                 pass
@@ -116,29 +119,17 @@ 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, reply_to: int) -> Message:
+async def send_and_cache_file(chat_id: int, file_info: dict, caption: str) -> 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')
 
-    video_exts = ('.mp4', '.mkv', '.mov', '.avi', '.webm')
-    audio_exts = ('.mp3', '.flac', '.ogg', '.wav')
-
-    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, 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, reply_to_message_id=reply_to)
-        media_type = 'audio'
-    else:
-        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
-        media_type = 'document'
+    sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption)
 
     if not file_info.get('cached') and sent_message:
-        file_id_to_cache = getattr(sent_message, media_type).file_id
+        file_id_to_cache = sent_message.document.file_id
         await db_utils.add_to_cache(
-            file_info['short_id'], file_id_to_cache, filename, media_type, file_info['size']
+            file_info['short_id'], file_id_to_cache, filename, 'document', file_info['size']
         )
 
     return sent_message
@@ -148,23 +139,32 @@ async def handle_batch_completion(batch_id: str):
     if not batch:
         return
 
-    status_msg = batch["status_message"]
     successful_downloads = batch["successful_downloads"]
 
     try:
         if not successful_downloads:
             failed_links_text = "\n".join(
-                [f"- {x['link']} \u2192 {x['error']}" for x in batch['failed_links']]
+                [f"- {x['link']} → {x['error']}" for x in batch['failed_links']]
             )
-            await status_msg.edit_text(
-                f"<b>❌ Batch `{batch_id[:6]}` failed. No files could be processed.</b>\nDetails:\n{failed_links_text}"
+            await bot.edit_message_text(
+                chat_id=batch["source_chat_id"],
+                message_id=batch["status_message_id"],
+                text=(
+                    f"❌ Batch <code>{batch_id[:6]}</code> failed. No files could be processed.\n"
+                    f"<b>Details:</b>\n{failed_links_text}"
+                )
             )
             return
 
-        await status_msg.edit_text(
-            f"📥 Batch `{batch_id[:6]}` downloaded. Preparing to send {len(successful_downloads)} files..."
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=(
+                f"✅ Batch <code>{batch_id[:6]}</code> downloaded. Sending {len(successful_downloads)} files..."
+            )
         )
 
+        # Forward original message if enabled
         if config.FORWARD_CHANNEL_ID:
             await bot.forward_message(
                 config.FORWARD_CHANNEL_ID,
@@ -173,30 +173,36 @@ 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, reply_to=None)
+                await send_and_cache_file(config.FORWARD_CHANNEL_ID, item, caption)
                 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, reply_to=batch['source_message_id'])
+            await send_and_cache_file(batch["source_chat_id"], item, caption)
 
-        summary = f"✅ Batch `{batch_id[:6]}` complete: {len(successful_downloads)} files sent."
+        summary = f"✅ Batch <code>{batch_id[:6]}</code> complete: {len(successful_downloads)} files sent."
         if batch["failed_links"]:
             summary += f"\n❌ {len(batch['failed_links'])} links failed."
 
-        await status_msg.edit_text(summary)
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=summary
+        )
 
     except Exception as e:
         logger.error(f"Error during batch completion for {batch_id}: {e}", exc_info=True)
-        await status_msg.edit_text(
-            f"A critical error occurred while sending files for batch `{batch_id[:6]}`."
+        await bot.edit_message_text(
+            chat_id=batch["source_chat_id"],
+            message_id=batch["status_message_id"],
+            text=(
+                f"⚠️ A critical error occurred while sending files for batch <code>{batch_id[:6]}</code>."
+            )
         )
     finally:
         for item in successful_downloads:
             if not item.get('cached') and os.path.exists(item['path']):
                 os.remove(item['path'])
-            if item.get('thumb') and os.path.exists(item['thumb']):
-                os.remove(item['thumb'])
 
         del BATCH_JOBS[batch_id]
 
@@ -205,37 +211,17 @@ 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 (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>"
+        "📥 Send me any valid Terabox link and I will fetch the file and send it to you.\n\n"
+        f"📢 Please make sure you are a member of: @{config.FORCE_SUB_CHANNEL_USERNAME}\n\n"
+        "🚀 Supports batch links & auto-caching.\n"
+        "💾 Fast & lightweight.\n\n"
+        "✅ <i>Just send your link 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 bot.send_message(
+        chat_id=message.chat.id,
+        text=text,
+        reply_to_message_id=message.message_id
     )
-    await message.reply(text)
 
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
@@ -248,7 +234,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"
@@ -258,8 +244,13 @@ async def message_handler(message: Message):
         return
 
     batch_id = str(uuid.uuid4())
-    status_msg = await message.reply(
-        f"✅ Found {len(terabox_links)} links. Queued as batch `{batch_id[:6]}`.",
+
+    status_msg = await bot.send_message(
+        chat_id=message.chat.id,
+        text=(
+            f"✅ Found {len(terabox_links)} links. Queued as batch <code>{batch_id[:6]}</code>.\n"
+            f"⏳ Please wait..."
+        ),
         reply_to_message_id=message.message_id
     )
 
@@ -271,7 +262,7 @@ async def message_handler(message: Message):
         "source_chat_id": message.chat.id,
         "source_user_id": message.from_user.id,
         "source_message_id": message.message_id,
-        "status_message": status_msg,
+        "status_message_id": status_msg.message_id,
         "lock": asyncio.Lock(),
         "start_time": time.time()
     }
@@ -290,5 +281,4 @@ def start_bot():
     dp.startup.register(on_startup)
     dp.message.register(message_handler)
     dp.message.register(start_handler, CommandStart())
-    dp.message.register(admin_handler, Command("admin"))
     return dp, bot