Update bot.py

bot.py

@@ -5,10 +5,9 @@ import logging
 import os
 import re
 import uuid
-import time
 from typing import Dict
 
-from aiogram import Bot, Dispatcher, types, F
+from aiogram import Bot, Dispatcher, F
 from aiogram.filters import CommandStart
 from aiogram.types import Message, FSInputFile
 from aiogram.enums import ParseMode
@@ -60,8 +59,6 @@ async def link_processor_worker(worker_id: int):
         file_info = None
         error_msg = f"An unknown error occurred for link: {original_link}"
 
-        start_time = time.time()
-
         try:
             short_id = await terabox.extract_terabox_short_id(original_link)
             if not short_id:
@@ -79,7 +76,7 @@ async def link_processor_worker(worker_id: int):
                 local_filepath, thumb_path, download_error = await terabox.download_terabox_file(
                     bot,
                     batch_info["source_chat_id"],
-                    batch_info["status_message_id"],
+                    batch_info["status_message"].message_id,
                     download_url,
                     raw_filename
                 )
@@ -106,21 +103,10 @@ 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']
-
-            elapsed = time.time() - batch_info['start_time']
-            avg_per_file = elapsed / processed if processed > 0 else 1
-            remaining = (total - processed) * avg_per_file
-            eta_text = f"~{int(remaining):d}s" if remaining > 1 else "<1s"
-
             try:
-                await bot.edit_message_text(
-                    chat_id=batch_info["source_chat_id"],
-                    message_id=batch_info["status_message_id"],
-                    text=(
-                        f"⚙️ <b>Batch</b> <code>{batch_id[:6]}</code> <b>Progress</b>: {processed}/{total} "
-                        f"(ETA: {eta_text})\n\n"
-                        f"Current link:\n<code>{original_link}</code>"
-                    )
+                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."
                 )
             except TelegramBadRequest:
                 pass
@@ -131,7 +117,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, reply_to: int, caption: str):
+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')
@@ -141,13 +127,13 @@ async def send_and_cache_file(chat_id: int, file_info: dict, reply_to: int, capt
 
     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)
+        sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True)
         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)
+        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption)
         media_type = 'audio'
     else:
-        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption, reply_to_message_id=reply_to)
+        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption)
         media_type = 'document'
 
     if not file_info.get('cached') and sent_message:
@@ -156,11 +142,14 @@ async def send_and_cache_file(chat_id: int, file_info: dict, reply_to: int, capt
             file_info['short_id'], file_id_to_cache, filename, media_type, file_info['size']
         )
 
+    return sent_message
+
 async def handle_batch_completion(batch_id: str):
     batch = BATCH_JOBS.get(batch_id)
     if not batch:
         return
 
+    status_msg = batch["status_message"]
     successful_downloads = batch["successful_downloads"]
 
     try:
@@ -168,23 +157,13 @@ async def handle_batch_completion(batch_id: str):
             failed_links_text = "\n".join(
                 [f"- {x['link']} → {x['error']}" for x in batch['failed_links']]
             )
-            await bot.edit_message_text(
-                chat_id=batch["source_chat_id"],
-                message_id=batch["status_message_id"],
-                text=(
-                    f"❌ <b>Batch</b> <code>{batch_id[:6]}</code> failed. No files could be processed.\n\n"
-                    f"<b>Details</b>:\n{failed_links_text}"
-                )
+            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}"
             )
             return
 
-        await bot.edit_message_text(
-            chat_id=batch["source_chat_id"],
-            message_id=batch["status_message_id"],
-            text=(
-                f"✅ <b>Batch</b> <code>{batch_id[:6]}</code> downloaded.\n"
-                f"Sending {len(successful_downloads)} files..."
-            )
+        await status_msg.edit_text(
+            f"✅ Batch <code>{batch_id[:6]}</code> downloaded.\nPreparing to send <b>{len(successful_downloads)}</b> files..."
         )
 
         if config.FORWARD_CHANNEL_ID:
@@ -195,29 +174,23 @@ 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, batch["source_message_id"], caption)
+                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, batch["source_message_id"], caption)
+            await send_and_cache_file(batch["source_chat_id"], item, caption)
 
-        summary = f"✅ <b>Batch</b> <code>{batch_id[:6]}</code> complete: {len(successful_downloads)} files sent."
+        summary = f"✅ Batch <code>{batch_id[:6]}</code> complete: <b>{len(successful_downloads)}</b> files sent."
         if batch["failed_links"]:
             summary += f"\n❌ {len(batch['failed_links'])} links failed."
 
-        await bot.edit_message_text(
-            chat_id=batch["source_chat_id"],
-            message_id=batch["status_message_id"],
-            text=summary
-        )
+        await status_msg.edit_text(summary)
 
     except Exception as e:
         logger.error(f"Error during batch completion for {batch_id}: {e}", exc_info=True)
-        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>."
+        await status_msg.edit_text(
+            f"❌ Critical error occurred while sending files for batch <code>{batch_id[:6]}</code>."
         )
     finally:
         for item in successful_downloads:
@@ -235,12 +208,12 @@ async def start_handler(message: Message):
         "👋 <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.\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>"
     )
-    await message.reply(text, reply_to_message_id=message.message_id)
+    await message.reply(text)
 
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
@@ -263,10 +236,8 @@ async def message_handler(message: Message):
         return
 
     batch_id = str(uuid.uuid4())
-
     status_msg = await message.reply(
-        f"✅ <b>Found</b> {len(terabox_links)} links. <b>Queued</b> as batch <code>{batch_id[:6]}</code>.",
-        reply_to_message_id=message.message_id
+        f"✅ <b>Found</b> {len(terabox_links)} links.\n<b>Queued</b> as batch <code>{batch_id[:6]}</code>."
     )
 
     BATCH_JOBS[batch_id] = {
@@ -277,9 +248,8 @@ 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_id": status_msg.message_id,
-        "lock": asyncio.Lock(),
-        "start_time": time.time()
+        "status_message": status_msg,
+        "lock": asyncio.Lock()
     }
 
     for link in terabox_links: