Update bot.py

bot.py

@@ -7,7 +7,7 @@ import re
 import uuid
 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
@@ -35,8 +35,7 @@ logger = logging.getLogger("bot")
 bot = Bot(
     token=config.BOT_TOKEN,
     default=DefaultBotProperties(
-        parse_mode=ParseMode.HTML,
-        link_preview_is_disabled=True  # only here — do NOT pass again in send_message/reply
+        parse_mode=ParseMode.HTML
     )
 )
 
@@ -68,7 +67,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(
+            local_filepath, _, download_error = await terabox.download_terabox_file(
                 bot,
                 batch_info["source_chat_id"],
                 batch_info["status_message"].message_id,
@@ -80,9 +79,7 @@ async def link_processor_worker(worker_id: int):
 
             file_info = {
                 'path': local_filepath,
-                'name': raw_filename,
-                'size': os.path.getsize(local_filepath),
-                'thumb': thumb_path
+                'name': raw_filename
             }
 
         except Exception as e:
@@ -97,8 +94,10 @@ async def link_processor_worker(worker_id: int):
 
             processed, total = batch_info['processed_links'], batch_info['total_links']
             try:
-                await batch_info["status_message"].edit_text(
-                    f"⚙️ Batch `{batch_id[:6]}` in progress... Processed {processed}/{total} links."
+                await bot.edit_message_text(
+                    chat_id=batch_info["source_chat_id"],
+                    message_id=batch_info["status_message"].message_id,
+                    text=f"⚙️ Batch `{batch_id[:6]}` in progress... Processed {processed}/{total} links."
                 )
             except TelegramBadRequest:
                 pass
@@ -110,20 +109,8 @@ async def link_processor_worker(worker_id: int):
         TASK_QUEUE.task_done()
 
 async def send_file(chat_id: int, file_info: dict, caption: str) -> Message:
-    file_path_or_id = FSInputFile(file_info['path'], filename=file_info['name'])
-    filename = file_info.get('name')
-
-    video_exts = ('.mp4', '.mkv', '.mov', '.avi', '.webm')
-    audio_exts = ('.mp3', '.flac', '.ogg', '.wav')
-
-    sent_message = None
-    if filename.lower().endswith(video_exts):
-        sent_message = await bot.send_video(chat_id, file_path_or_id, caption=caption, supports_streaming=True)
-    elif filename.lower().endswith(audio_exts):
-        sent_message = await bot.send_audio(chat_id, file_path_or_id, caption=caption)
-    else:
-        sent_message = await bot.send_document(chat_id, file_path_or_id, caption=caption)
-
+    file_path = FSInputFile(file_info['path'], filename=file_info['name'])
+    sent_message = await bot.send_document(chat_id, file_path, caption=caption)
     return sent_message
 
 async def handle_batch_completion(batch_id: str):
@@ -139,26 +126,19 @@ 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 status_msg.edit_text(
-                f"❌ Batch `{batch_id[:6]}` failed. No files could be processed.\nDetails:\n{failed_links_text}"
+            await bot.edit_message_text(
+                chat_id=batch["source_chat_id"],
+                message_id=status_msg.message_id,
+                text=f"❌ Batch `{batch_id[:6]}` failed. No files could be processed.\nDetails:\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=status_msg.message_id,
+            text=f"✅ Batch `{batch_id[:6]}` downloaded. Preparing to send {len(successful_downloads)} files..."
         )
 
-        if config.FORWARD_CHANNEL_ID:
-            await bot.forward_message(
-                config.FORWARD_CHANNEL_ID,
-                batch["source_chat_id"],
-                batch["source_message_id"]
-            )
-            for item in successful_downloads:
-                caption = f"`{item.get('name')}`"
-                await send_file(config.FORWARD_CHANNEL_ID, item, caption)
-                await asyncio.sleep(1)
-
         for item in successful_downloads:
             caption = f"`{item.get('name')}`"
             await send_file(batch["source_chat_id"], item, caption)
@@ -167,19 +147,23 @@ async def handle_batch_completion(batch_id: str):
         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=status_msg.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=status_msg.message_id,
+            text=f"A critical error occurred while sending files for batch `{batch_id[:6]}`."
         )
     finally:
         for item in successful_downloads:
             if 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]
 
@@ -190,8 +174,6 @@ async def start_handler(message: Message):
         "👋 <b>Welcome to the Terabox Downloader Bot!</b>\n\n"
         "📥 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.\n"
-        "💾 Fast & lightweight.\n\n"
         "✅ <i>Just send your link below ⬇️</i>"
     )
     await message.reply(text)
@@ -217,7 +199,10 @@ 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 `{batch_id[:6]}`."
+    )
 
     BATCH_JOBS[batch_id] = {
         "total_links": len(terabox_links),