Fixed Batch Link

Thunder/bot/plugins/admin.py

@@ -93,7 +93,7 @@ async def get_total_users(client, message):
     try:
         total_users = await db.total_users_count()
         reply_markup = InlineKeyboardMarkup([
-            [InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+            [InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ])
         await message.reply_text(
             MSG_DB_STATS.format(total_users=total_users),
@@ -289,7 +289,7 @@ async def show_status(client, message):
             version=__version__
         )
         reply_markup = InlineKeyboardMarkup([
-            [InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+            [InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ])
         await message.reply_text(stats_text, parse_mode=ParseMode.MARKDOWN, reply_markup=reply_markup)
     except:
@@ -314,7 +314,7 @@ async def show_stats(client, message):
             disk_percent=psutil.disk_usage('.').percent
         )
         reply_markup = InlineKeyboardMarkup([
-            [InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+            [InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ])
         await message.reply_text(stats_text, parse_mode=ParseMode.MARKDOWN, reply_markup=reply_markup)
     except:
@@ -399,7 +399,7 @@ async def list_authorized_command(client, message):
                 auth_time=user['authorized_at']
             )
         reply_markup = InlineKeyboardMarkup([
-            [InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+            [InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ])
         await message.reply_text(
             message_text,
@@ -550,7 +550,7 @@ async def close_panel(client, callback_query):
 async def restart_broadcast(client, callback_query):
     try:
         await callback_query.edit_message_text(
-            "Please use `/broadcast` command with a reply to the message you want to broadcast.",
+            MSG_ERROR_BROADCAST_INSTRUCTION,
             parse_mode=ParseMode.MARKDOWN
         )
     except:

Thunder/bot/plugins/callbacks.py

@@ -59,7 +59,7 @@ async def help_callback(client: Client, callback_query: CallbackQuery):
             buttons.append(force_button)
         
         # Add close button at the end
-        buttons.append([InlineKeyboardButton("🗙 Close", callback_data="close_panel")])
+        buttons.append([InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")])
         
         await callback_query.message.edit_text(
             text=MSG_HELP,
@@ -85,7 +85,7 @@ async def about_callback(client: Client, callback_query: CallbackQuery):
         buttons = [
             [InlineKeyboardButton(MSG_BUTTON_GET_HELP, callback_data="help_command")],
             [InlineKeyboardButton(MSG_BUTTON_GITHUB, url="https://github.com/fyaz05/FileToLink"),
-             InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+             InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ]
         
         await callback_query.message.edit_text(
@@ -113,7 +113,7 @@ async def restart_broadcast_callback(client: Client, callback_query: CallbackQue
         # Create back and close buttons
         buttons = [
             [InlineKeyboardButton(MSG_BUTTON_GET_HELP, callback_data="help_command"),
-             InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+             InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ]
         
         await callback_query.message.edit_text(

Thunder/bot/plugins/common.py

@@ -135,7 +135,7 @@ async def start_command(bot: Client, message: Message):
                 ],
                 [
                     InlineKeyboardButton(MSG_BUTTON_GITHUB, url="https://github.com/fyaz05/FileToLink/"),
-                    InlineKeyboardButton("🗙 Close", callback_data="close_panel")
+                    InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")
                 ]
             ])
 
@@ -248,7 +248,7 @@ async def help_command(bot: Client, message: Message):
             except Exception as e_help:
                 logger.error(f"(ID: {error_id_context_help}) Error adding force channel button to /help command (User: {user_id_str}, FChannel: {Var.FORCE_CHANNEL_ID}): {e_help}")
 
-        buttons.append([InlineKeyboardButton("🗙 Close", callback_data="close_panel")])
+        buttons.append([InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")])
         reply_markup = InlineKeyboardMarkup(buttons)
 
         await message.reply_text(
@@ -273,7 +273,7 @@ async def about_command(bot: Client, message: Message):
         buttons = [
             [InlineKeyboardButton(MSG_BUTTON_GET_HELP, callback_data="help_command")],
             [InlineKeyboardButton(MSG_BUTTON_GITHUB, url="https://github.com/fyaz05/FileToLink"),
-             InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+             InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ]
 
         reply_markup = InlineKeyboardMarkup(buttons)
@@ -310,7 +310,7 @@ async def dc_command(bot: Client, message: Message):
                 InlineKeyboardButton(MSG_BUTTON_VIEW_PROFILE, url=profile_url)
             ])
             buttons.append([
-                InlineKeyboardButton("🗙 Close", callback_data="close_panel")
+                InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")
             ])
             dc_keyboard = InlineKeyboardMarkup(buttons)
 
@@ -411,7 +411,7 @@ async def ping_command(bot: Client, message: Message):
         time_taken_ms = (end_time - start_time) * 1000
         buttons = [
             [InlineKeyboardButton(MSG_BUTTON_GET_HELP, callback_data="help_command"),
-             InlineKeyboardButton("🗙 Close", callback_data="close_panel")]
+             InlineKeyboardButton(MSG_BUTTON_CLOSE, callback_data="close_panel")]
         ]
         
         await sent_msg.edit_text(

Thunder/bot/plugins/stream.py

@@ -252,10 +252,12 @@ async def forward_media(media_message):
     for retry in range(3):
         try:
             result = await media_message.copy(chat_id=Var.BIN_CHANNEL)
+            await asyncio.sleep(0.1)
             return result
         except Exception:
             try:
                 result = await media_message.forward(chat_id=Var.BIN_CHANNEL)
+                await asyncio.sleep(0.1)
                 return result
             except FloodWait as flood_error:
                 if retry < 2:
@@ -284,6 +286,7 @@ async def log_request(log_msg, user, stream_link, online_link):
             link_preview_options=LinkPreviewOptions(is_disabled=True),
             quote=True
         )
+        await asyncio.sleep(0.3)
     except Exception:
         pass
 
@@ -497,17 +500,40 @@ async def process_multiple_messages(client, command_message, reply_msg, num_file
 
         for chunk in chunk_list(download_links, 20):
             links_text = "\n".join(chunk)
-            batch_links_message = MSG_BATCH_LINKS_READY.format(
-                count=len(chunk),
-                links=links_text
-            )
             
-            await command_message.reply_text(
-                batch_links_message,
-                quote=True,
-                link_preview_options=LinkPreviewOptions(is_disabled=True),
-                parse_mode=enums.ParseMode.MARKDOWN
-            )
+            # Message for the group chat
+            group_message_content = MSG_BATCH_LINKS_READY.format(count=len(chunk)) + f"\n\n`{links_text}`"
+            
+            # Message for the user's DM
+            dm_prefix = MSG_DM_BATCH_PREFIX.format(chat_title=command_message.chat.title)
+            dm_message_text = f"{dm_prefix}\n{group_message_content}"
+
+            # Send to original chat (group/supergroup)
+            try:
+                await command_message.reply_text(
+                    group_message_content,
+                    quote=True,
+                    link_preview_options=LinkPreviewOptions(is_disabled=True),
+                    parse_mode=enums.ParseMode.MARKDOWN
+                )
+            except Exception as e:
+                logger.error(f"Error sending batch links to original chat {command_message.chat.id}: {e}")
+
+            # Send to user's DM (if in a group/supergroup)
+            if command_message.chat.type in [enums.ChatType.GROUP, enums.ChatType.SUPERGROUP]:
+                try:
+                    await client.send_message(
+                        chat_id=command_message.from_user.id,
+                        text=dm_message_text,
+                        link_preview_options=LinkPreviewOptions(is_disabled=True),
+                        parse_mode=enums.ParseMode.MARKDOWN
+                    )
+                except Exception as e:
+                    logger.error(f"Error sending batch links to user DM {command_message.from_user.id}: {e}")
+                    await command_message.reply_text(
+                        MSG_ERROR_DM_FAILED,
+                        quote=True
+                    )
             
             if len(chunk) > 10:
                 await asyncio.sleep(0.5)
@@ -639,7 +665,7 @@ async def link_handler(client, message, shortener=True):
                             )
                             await client.send_message(
                                 chat_id=message.from_user.id,
-                                text=MSG_BATCH_LINKS_FROM.format(
+                                text=MSG_LINK_FROM_GROUP.format(
                                     chat_title=message.chat.title,
                                     links_message=msg_text
                                 ),
@@ -652,7 +678,8 @@ async def link_handler(client, message, shortener=True):
                                     ]
                                 ]),
                             )
-                    except Exception:
+                    except Exception as e:
+                        logger.debug(f"Error sending DM to user {message.from_user.id} from group: {e}")
                         await message.reply_text(
                             MSG_ERROR_DM_FAILED,
                             quote=True

Thunder/utils/messages.py

@@ -159,6 +159,7 @@ MSG_BUTTON_JOIN_CHANNEL = "📢 Join {channel_title}"
 MSG_BUTTON_GITHUB = "🛠️ GitHub"
 MSG_BUTTON_START_CHAT = "📩 Start Chat"
 MSG_BUTTON_JOIN_CHAT = "📢 Join {chat_title}"
+MSG_BUTTON_CLOSE = "✖ Close"
 
 # ------ Quick Start Guide ------
 MSG_QUICK_START_GUIDE = (
@@ -221,7 +222,7 @@ MSG_HELP = (
 
 MSG_ABOUT = (
     "🌟 **About Thunder File to Link Bot** ℹ️\n\n"
-    "I'm your go-to bot for **instant direct download & streaming links!** ⚡\n\n"
+    "I'm your go-to bot for **instant download & streaming!** ⚡\n\n"
     "**🚀 Key Features:**\n"
     "> **Instant Links:** Get your links within seconds.\n"
     "> **Online Streaming:** Watch videos or listen to audio directly (for supported formats).\n"
@@ -309,8 +310,9 @@ MSG_NEW_FILE_REQUEST = (
 MSG_PROCESSING_BATCH = "🔄 **Processing Batch {batch_number}/{total_batches}** ({file_count} files)"
 MSG_PROCESSING_STATUS = "📊 **Processing Files:** {processed}/{total} complete, {failed} failed"
 MSG_PROCESSING_WARNING = "⚠️ **Warning:** Too many files failed processing. Please try again with fewer files or contact support."
-MSG_BATCH_LINKS_READY = "🔗 **Batch Links ({count} files):**\n\n`{links}`"
-MSG_BATCH_LINKS_FROM = "📬 **Links from {chat_title}**\n\n`{links_message}`"
+MSG_BATCH_LINKS_READY = "🔗 Here are your {count} download links:"
+MSG_DM_BATCH_PREFIX = "📬 **Batch Links from {chat_title}**\n"
+MSG_LINK_FROM_GROUP = "📬 **Links from {chat_title}**\n\n{links_message}"
 MSG_PROCESSING_RESULT = "✅ **Process Complete:** {processed}/{total} files processed successfully, {failed} failed"
 MSG_PROCESSING_ERROR = "❌ **Error Processing Files:** {error}\n\n{processed}/{total} files were processed (ID: {error_id})"
 MSG_RETRYING_FILES = "🔄 **Retrying {count} Failed Files...**"
@@ -337,15 +339,12 @@ MSG_ERROR_BROADCAST_INSTRUCTION = "To start a new broadcast, use the /broadcast
 MSG_ERROR_CALLBACK_UNSUPPORTED = "This button is not active or no longer supported."
 MSG_ERROR_GENERIC_CALLBACK = "An error occurred. Please try again later. (ID: {error_id})"
 MSG_BROADCAST_COMPLETE = (
-    "📢 **Broadcast Completed Successfully!** 📢\n"
-    "──────────────────────────────\n"
+    "📢 **Broadcast Completed Successfully!** 📢\n\n"
     "⏱️ **Duration:** `{elapsed_time}`\n"
     "👥 **Total Users:** `{total_users}`\n"
     "✅ **Successful Deliveries:** `{successes}`\n"
-    "❌ **Failed Deliveries:** `{failures}`\n"
-    "──────────────────────────────\n"
-    "🗑️ **Accounts Removed (Blocked/Deactivated):** `{deleted_accounts}`\n" # Clarified
-    "──────────────────────────────"
+    "❌ **Failed Deliveries:** `{failures}`\n\n"
+    "🗑️ **Accounts Removed (Blocked/Deactivated):** `{deleted_accounts}`\n"
 )
 MSG_BROADCAST_CANCEL = "🛑 **Cancelling Broadcast:** `{broadcast_id}`\n\n> ⏳ Stopping operations..."
 MSG_BROADCAST_FAILED = (