Update bot.py

bot.py

@@ -7,7 +7,7 @@ import re
 import uuid
 from typing import Dict
 
-from aiogram import Bot, Dispatcher, F
+from aiogram import Bot, Dispatcher, types, F
 from aiogram.filters import CommandStart
 from aiogram.types import Message, FSInputFile
 from aiogram.enums import ParseMode
@@ -63,24 +63,29 @@ async def link_processor_worker(worker_id: int):
             if not short_id:
                 raise ValueError("Invalid Terabox link format.")
 
-            download_url, raw_filename, error = await terabox.get_final_url_and_filename(original_link)
-            if error:
-                raise ValueError(error)
+            cached_file = await db_utils.get_cached_file(short_id)
+            if cached_file:
+                logger.info(f"Cache hit for {short_id}. Reusing file_id.")
+                file_info = {'cached': True, 'short_id': short_id, **cached_file}
+            else:
+                download_url, raw_filename, error = await terabox.get_final_url_and_filename(original_link)
+                if error:
+                    raise ValueError(error)
 
-            local_filepath, _, download_error = await terabox.download_terabox_file(
-                bot,
-                batch_info["source_chat_id"],
-                batch_info["status_message"].message_id,
-                download_url,
-                raw_filename
-            )
-            if download_error:
-                raise ValueError(download_error)
+                local_filepath, download_error = await terabox.download_terabox_file(
+                    download_url,
+                    raw_filename
+                )
+                if download_error:
+                    raise ValueError(download_error)
 
-            file_info = {
-                'path': local_filepath,
-                'name': raw_filename
-            }
+                file_info = {
+                    'cached': False,
+                    'path': local_filepath,
+                    'name': raw_filename,
+                    'size': os.path.getsize(local_filepath),
+                    'short_id': short_id,
+                }
 
         except Exception as e:
             error_msg = str(e)
@@ -93,24 +98,48 @@ 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']
+
             try:
-                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."
+                await batch_info["status_message"].edit_text(
+                    f"⚙️ Batch <code>{batch_id[:6]}</code> in progress...\nProcessed {processed}/{total} links.",
+                    disable_web_page_preview=True
                 )
             except TelegramBadRequest:
                 pass
 
+            await asyncio.sleep(0.3)  # prevent rate limit
+
             if processed == total:
                 logger.info(f"Batch {batch_id[:6]} complete. Triggering final processing.")
                 await handle_batch_completion(batch_id)
 
         TASK_QUEUE.task_done()
 
-async def send_file(chat_id: int, file_info: dict, caption: str) -> Message:
-    file_path = FSInputFile(file_info['path'], filename=file_info['name'])
-    sent_message = await bot.send_document(chat_id, file_path, caption=caption)
+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)
+        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)
+        media_type = 'audio'
+    else:
+        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:
+        file_id_to_cache = getattr(sent_message, media_type).file_id
+        await db_utils.add_to_cache(
+            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):
@@ -126,45 +155,48 @@ 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=status_msg.message_id,
-                text=f"❌ Batch `{batch_id[:6]}` failed. No files could be processed.\nDetails:\n{failed_links_text}"
+            await status_msg.edit_text(
+                f"❌ Batch <code>{batch_id[:6]}</code> failed. No files could be processed.\nDetails:\n{failed_links_text}",
+                disable_web_page_preview=True
             )
             return
 
-        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..."
+        await status_msg.edit_text(
+            f"✅ Batch <code>{batch_id[:6]}</code> downloaded. Preparing to send {len(successful_downloads)} files...",
+            disable_web_page_preview=True
         )
 
+        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"🎬 <code>{item.get('name') or item.get('filename')}</code>"
+                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')}`"
-            await send_file(batch["source_chat_id"], item, caption)
+            caption = f"🎬 <code>{item.get('name') or item.get('filename')}</code>"
+            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 bot.edit_message_text(
-            chat_id=batch["source_chat_id"],
-            message_id=status_msg.message_id,
-            text=summary
-        )
+        await status_msg.edit_text(summary, disable_web_page_preview=True)
 
     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=status_msg.message_id,
-            text=f"A critical error occurred while sending files for batch `{batch_id[:6]}`."
+        await status_msg.edit_text(
+            f"❌ A critical error occurred while sending files for batch <code>{batch_id[:6]}</code>.",
+            disable_web_page_preview=True
         )
     finally:
         for item in successful_downloads:
-            if os.path.exists(item['path']):
+            if not item.get('cached') and os.path.exists(item['path']):
                 os.remove(item['path'])
-
         del BATCH_JOBS[batch_id]
 
 # --- Handlers ---
@@ -172,11 +204,14 @@ 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 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"
-        "✅ <i>Just send your link below ⬇️</i>"
+        "📥 Send me any valid <b>Terabox</b> link(s), and I will fetch and send the files to you.\n\n"
+        "✅ Multi-link batch supported!\n"
+        "💾 Cache enabled → faster for repeat links.\n"
+        "📢 Original message will be forwarded to: "
+        f"<b>@{config.FORCE_SUB_CHANNEL_USERNAME}</b> (if configured).\n\n"
+        "🚀 <i>Just send your link(s) below ⬇️</i>"
     )
-    await message.reply(text)
+    await message.answer(text, disable_web_page_preview=True)
 
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
@@ -199,10 +234,7 @@ async def message_handler(message: Message):
         return
 
     batch_id = str(uuid.uuid4())
-    status_msg = await bot.send_message(
-        chat_id=message.chat.id,
-        text=f"✅ Found {len(terabox_links)} links. Queued as batch `{batch_id[:6]}`."
-    )
+    status_msg = await message.answer(f"✅ Found {len(terabox_links)} link(s). Queued as batch <code>{batch_id[:6]}</code>.", disable_web_page_preview=True)
 
     BATCH_JOBS[batch_id] = {
         "total_links": len(terabox_links),