Update bot.py

bot.py

@@ -1,3 +1,5 @@
+# bot.py
+
 import asyncio
 import logging
 import os
@@ -34,7 +36,7 @@ bot = Bot(
     token=config.BOT_TOKEN,
     default=DefaultBotProperties(
         parse_mode=ParseMode.HTML,
-        link_preview_is_disabled=True
+        link_preview_is_disabled=True  # only here — do NOT pass again in send_message/reply
     )
 )
 
@@ -62,33 +64,26 @@ async def link_processor_worker(worker_id: int):
             if not short_id:
                 raise ValueError("Invalid Terabox link format.")
 
-            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, 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
-                )
-                if download_error:
-                    raise ValueError(download_error)
-
-                file_info = {
-                    'cached': False,
-                    'path': local_filepath,
-                    'name': raw_filename,
-                    'size': os.path.getsize(local_filepath),
-                    'short_id': short_id,
-                    'thumb': thumb_path
-                }
+            download_url, raw_filename, error = await terabox.get_final_url_and_filename(original_link)
+            if error:
+                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
+            )
+            if download_error:
+                raise ValueError(download_error)
+
+            file_info = {
+                'path': local_filepath,
+                'name': raw_filename,
+                'size': os.path.getsize(local_filepath),
+                'thumb': thumb_path
+            }
 
         except Exception as e:
             error_msg = str(e)
@@ -114,30 +109,20 @@ 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:
-    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')
+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 media_type == 'video' or filename.lower().endswith(video_exts):
+    if 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):
+    elif 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
 
@@ -170,13 +155,13 @@ async def handle_batch_completion(batch_id: str):
                 batch["source_message_id"]
             )
             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)
+                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') or item.get('filename')}`"
-            await send_and_cache_file(batch["source_chat_id"], item, caption)
+            caption = f"`{item.get('name')}`"
+            await send_file(batch["source_chat_id"], item, caption)
 
         summary = f"✅ Batch `{batch_id[:6]}` complete: {len(successful_downloads)} files sent."
         if batch["failed_links"]:
@@ -191,7 +176,7 @@ async def handle_batch_completion(batch_id: str):
         )
     finally:
         for item in successful_downloads:
-            if not item.get('cached') and os.path.exists(item['path']):
+            if os.path.exists(item['path']):
                 os.remove(item['path'])
             if item.get('thumb') and os.path.exists(item['thumb']):
                 os.remove(item['thumb'])
@@ -205,16 +190,11 @@ 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 & auto-caching.\n"
+        "🚀 Supports batch links.\n"
         "💾 Fast & lightweight.\n\n"
         "✅ <i>Just send your link below ⬇️</i>"
     )
-    await bot.send_message(
-        chat_id=message.chat.id,
-        text=text,
-        parse_mode=ParseMode.HTML,
-        disable_web_page_preview=True
-    )
+    await message.reply(text)
 
 @dp.message(F.text | F.caption)
 async def message_handler(message: Message):
@@ -227,7 +207,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,12 +217,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]}`.",
-        parse_mode=ParseMode.HTML,
-        disable_web_page_preview=True
-    )
+    status_msg = await message.reply(f"✅ Found {len(terabox_links)} links. Queued as batch `{batch_id[:6]}`.")
 
     BATCH_JOBS[batch_id] = {
         "total_links": len(terabox_links),
@@ -270,4 +245,4 @@ def start_bot():
     dp.startup.register(on_startup)
     dp.message.register(message_handler)
     dp.message.register(start_handler, CommandStart())
-    return dp, bot
+    return dp, bot