Update app.py

app.py

@@ -57,7 +57,6 @@ ffmpeg_available = True
 # ================= AUTO SHARE VARIABLES =================
 auto_share_running = False
 auto_share_task = None
-TARGET_SHARE_GROUP = -1004333630822
 # =========================================================
 
 try:
@@ -363,8 +362,8 @@ async def save_progress(source_id, dest_id, msg_id):
     except Exception as e: print(f"Error saving progress: {e}")
 
 
-# ================= FIXED AUTO SHARE LOGIC =================
-async def auto_share_loop(client, target_chat_id, delay=300):
+# ================= SMART AUTO SHARE LOGIC =================
+async def auto_share_loop(client, delay=300):
     global auto_share_running
     
     try:
@@ -379,7 +378,6 @@ async def auto_share_loop(client, target_chat_id, delay=300):
         f"👉 <b><a href='{bot_link}'>▶️ Click Here to Watch</a></b>\n\n"
         f"🎁 <b>App এর ভেতর 'Secret Box' ওপেন করে Premium Channel Claim করুন!</b> 👇"
     )
-    # ২টা বাটন: একটা ভিডিও দেখার, অন্যটা সিক্রেট বক্সের
     group_markup = InlineKeyboardMarkup([
         [InlineKeyboardButton("🎬 Watch Full Video Here 🔞", url=bot_link)],
         [InlineKeyboardButton("🎁 Open Secret Box", url=f"{bot_link}?start=secretbox")]
@@ -387,18 +385,37 @@ async def auto_share_loop(client, target_chat_id, delay=300):
     
     while auto_share_running:
         try:
-            progress_res = await db_query(lambda: supabase.table('clone_progress').select('last_copied_id').eq('source_id', STORAGE_CHANNEL_ID).eq('dest_id', target_chat_id).execute())
-            last_checked_id = 0
-            if progress_res.data:
-                last_checked_id = progress_res.data[0]['last_copied_id']
+            # ১. ডাটাবেজ থেকে সব গ্রুপ আনা এবং অ্যাডমিন পারমিশন চেক করা
+            groups_res = await db_query(lambda: supabase.table('groups').select('group_id').execute())
+            eligible_groups = []
+            
+            if groups_res.data:
+                for g in groups_res.data:
+                    gid = g['group_id']
+                    try:
+                        member = await client.get_chat_member(gid, "me")
+                        # চেক করবে বট অ্যাডমিন কিনা এবং মেসেজ ডিলিট করার পারমিশন আছে কিনা
+                        if member.status in [enums.ChatMemberStatus.ADMINISTRATOR, enums.ChatMemberStatus.OWNER]:
+                            if member.privileges and member.privileges.can_delete_messages:
+                                eligible_groups.append(gid)
+                    except FloodWait as e:
+                        await asyncio.sleep(e.value + 1)
+                    except Exception:
+                        pass # বট গ্রুপে না থাকলে বা ব্যান খেলে স্কিপ করবে
+            
+            if not eligible_groups:
+                await asyncio.sleep(60) # কোনো এলিজিবল গ্রুপ না পেলে ১ মিনিট ওয়েট করবে
+                continue
+
+            # ২. স্টোরেজ থেকে ৫টি ভিডিও নেওয়া (dest_id = -1 ব্যবহার করা হচ্ছে গ্লোবাল ট্র্যাকিং এর জন্য)
+            progress_res = await db_query(lambda: supabase.table('clone_progress').select('last_copied_id').eq('source_id', STORAGE_CHANNEL_ID).eq('dest_id', -1).execute())
+            last_checked_id = progress_res.data[0]['last_copied_id'] if progress_res.data else 0
 
             batch_to_send = []
             current_id = last_checked_id + 1
-            search_limit = 50 
             highest_valid_id = last_checked_id
 
-            chunk_ids = list(range(current_id, current_id + search_limit))
-
+            chunk_ids = list(range(current_id, current_id + 50))
             try:
                 msgs = await client.get_messages(STORAGE_CHANNEL_ID, chunk_ids)
                 valid_messages_found = False
@@ -408,7 +425,6 @@ async def auto_share_loop(client, target_chat_id, delay=300):
                     if msg and not getattr(msg, "empty", False):
                         valid_messages_found = True
                         highest_valid_id = msg.id 
-
                         if msg.video or (msg.document and msg.document.mime_type and "video" in msg.document.mime_type) or msg.photo:
                             batch_to_send.append(msg)
                             if len(batch_to_send) == 5:
@@ -417,51 +433,52 @@ async def auto_share_loop(client, target_chat_id, delay=300):
                 await asyncio.sleep(e.value + 1)
                 continue
             except Exception as e:
-                print(f"Fetch error in auto share: {e}")
                 await asyncio.sleep(5)
                 continue
 
             if not batch_to_send:
                 if valid_messages_found and highest_valid_id > last_checked_id:
-                    await save_progress(STORAGE_CHANNEL_ID, target_chat_id, highest_valid_id)
+                    await save_progress(STORAGE_CHANNEL_ID, -1, highest_valid_id)
                 await asyncio.sleep(30) 
                 continue
                 
-            last_sent_id = highest_valid_id
-            sent_message_ids = []
+            # ৩. এলিজিবল গ্রুপগুলোতে ৫টি ভিডিও সেন্ড করা
+            sent_message_ids = {} # { group_id: [msg_id1, msg_id2...] }
             
             for msg in batch_to_send:
                 if not auto_share_running: break
-                try:
-                    sent = await msg.copy(
-                        target_chat_id,
-                        caption=caption_text,
-                        reply_markup=group_markup
-                    )
-                    sent_message_ids.append(sent.id)
-                    last_sent_id = msg.id 
-                    await asyncio.sleep(1.5) 
-                except FloodWait as e:
-                    await asyncio.sleep(e.value + 1)
-                except Exception as e:
-                    print(f"Error copying msg {msg.id}: {e}")
-                    
-            if last_sent_id > last_checked_id:
-                await save_progress(STORAGE_CHANNEL_ID, target_chat_id, last_sent_id)
+                for gid in eligible_groups:
+                    try:
+                        sent = await msg.copy(gid, caption=caption_text, reply_markup=group_markup)
+                        if gid not in sent_message_ids:
+                            sent_message_ids[gid] = []
+                        sent_message_ids[gid].append(sent.id)
+                        await asyncio.sleep(1) # ফ্লাডওয়েট এড়াতে স্লিপ
+                    except FloodWait as e:
+                        await asyncio.sleep(e.value + 1)
+                    except Exception:
+                        pass
+                        
+            if highest_valid_id > last_checked_id:
+                await save_progress(STORAGE_CHANNEL_ID, -1, highest_valid_id)
             
+            # ৪. ৫ মিনিট অপেক্ষা করা
             for _ in range(delay):
                 if not auto_share_running: break
                 await asyncio.sleep(1)
                 
-            if sent_message_ids and auto_share_running:
-                try:
-                    await client.delete_messages(target_chat_id, sent_message_ids)
-                except FloodWait as e:
-                    await asyncio.sleep(e.value + 1)
-                    await client.delete_messages(target_chat_id, sent_message_ids)
-                except Exception as e:
-                    print(f"Error deleting msgs: {e}")
-                    
+            # ৫. সব গ্রুপ থেকে পাঠানো ভিডিওগুলো ডিলিট করা
+            if auto_share_running:
+                for gid, msg_ids in sent_message_ids.items():
+                    try:
+                        await client.delete_messages(gid, msg_ids)
+                        await asyncio.sleep(1)
+                    except FloodWait as e:
+                        await asyncio.sleep(e.value + 1)
+                        await client.delete_messages(gid, msg_ids)
+                    except Exception:
+                        pass
+                        
         except Exception as e:
             print(f"Auto-share loop error: {e}")
             await asyncio.sleep(5)
@@ -472,15 +489,15 @@ async def start_sharing_cmd(client, message):
     args = message.command
     
     if len(args) > 1 and args[1].lower() == "reset":
-        await save_progress(STORAGE_CHANNEL_ID, TARGET_SHARE_GROUP, 0)
+        await save_progress(STORAGE_CHANNEL_ID, -1, 0)
         await message.reply("🔄 <b>Progress reset!</b> The bot will now start sharing from the 1st video.")
         
     if auto_share_running:
         return await message.reply("⚠️ <b>Auto-share is already running!</b>\nUse `/stopshare` to stop it first.")
     
     auto_share_running = True
-    auto_share_task = asyncio.create_task(auto_share_loop(client, TARGET_SHARE_GROUP, 300))
-    await message.reply(f"✅ <b>Auto-sharing started!</b>\n\n📌 <b>Target Group:</b> <code>{TARGET_SHARE_GROUP}</code>\n📦 <b>Batch Size:</b> 5 videos\n⏱ <b>Interval:</b> 5 minutes\n\n<i>Bot will send 5 videos with new caption & Secret Box button!</i>", parse_mode=enums.ParseMode.HTML)
+    auto_share_task = asyncio.create_task(auto_share_loop(client, 300))
+    await message.reply(f"✅ <b>Smart Auto-sharing started!</b>\n\n📌 <b>Target:</b> All Groups (Admin + Delete Permitted)\n📦 <b>Batch Size:</b> 5 videos\n⏱ <b>Interval:</b> 5 minutes\n\n<i>Bot will scan all groups, verify permissions, send 5 videos, and delete them automatically!</i>", parse_mode=enums.ParseMode.HTML)
 
 @bot.on_message(filters.command("stopshare") & filters.private & filters.user(ADMIN_IDS))
 async def stop_sharing_cmd(client, message):
@@ -505,6 +522,7 @@ async def help_command(client, message):
         help_text += "👉 `/stats` - Check total users, videos, and groups.\n"
         help_text += "👉 `/broadcast` - Send a message to all bot users.\n"
         help_text += "👉 `/clone <source_id> <dest_id>` - Clone videos from one group to another.\n"
+        help_text += "👉 `/cloneall` - Mass clone all videos from all connected groups to Target Group.\n"
         help_text += "👉 `/sendto <group_id>` - Reply to a media to forward it directly to a specific group.\n"
         help_text += "👉 `/upload <telegram/byse>` - Change video upload server (Local or byse.sx).\n"
         help_text += "👉 `/blur <percentage>` - Enable video/photo blur (e.g., `/blur 60`). Send `/blur 0` to disable.\n"
@@ -606,27 +624,6 @@ async def bot_added_to_group(client, message):
                     try: await client.send_message(chat_id=admin_id, text=admin_msg, parse_mode=enums.ParseMode.HTML)
                     except: pass
 
-                progress_res = await db_query(lambda: supabase.table('clone_progress').select('source_id', 'last_copied_id').eq('dest_id', 0).execute())
-                
-                if progress_res.data:
-                    last_record = progress_res.data[0]
-                    src_chat = last_record['source_id']
-                    msg_id = last_record['last_copied_id']
-                    
-                    bot_link = f"https://t.me/{me.username}"
-                    caption_text = (
-                        f"🔥 <b>New Premium Viral Video Leaked!</b> 🔞\n\n"
-                        f"🎬 <b>Watch HD Video Here:</b>\n"
-                        f"👉 <b><a href='{bot_link}'>▶️ Click Here to Watch</a></b>\n\n"
-                        f"🎁 <b>App এর ভেতর 'Secret Box' ওপেন করে Premium Channel Claim করুন!</b> 👇"
-                    )
-                    group_markup = InlineKeyboardMarkup([
-                        [InlineKeyboardButton("🎬 Watch Full Video Here 🔞", url=bot_link)],
-                        [InlineKeyboardButton("🎁 Open Secret Box", url=f"{bot_link}?start=secretbox")]
-                    ])
-                    
-                    await asyncio.sleep(2)
-                    await client.copy_message(message.chat.id, src_chat, msg_id, caption=caption_text, reply_markup=group_markup)
             except Exception as e:
                 print(f"Error handling new group logic: {e}")
 
@@ -734,6 +731,91 @@ async def start_cloning(client, message):
     status_msg = await message.reply("⏳ Initializing cloning task...", parse_mode=enums.ParseMode.HTML)
     asyncio.create_task(clone_videos_background(client, source_id, dest_id, status_msg))
 
+
+# ================= MASS CLONE FROM ALL GROUPS =================
+async def clone_all_background(client, dest_id, status_msg):
+    try:
+        groups_res = await db_query(lambda: supabase.table('groups').select('group_id').execute())
+        if not groups_res.data:
+            return await status_msg.edit_text("❌ <b>No groups found in database.</b>", parse_mode=enums.ParseMode.HTML)
+            
+        groups = [g['group_id'] for g in groups_res.data]
+        total_groups = len(groups)
+        
+        await status_msg.edit_text(f"✅ Found <b>{total_groups}</b> groups.\n🚀 Starting mass cloning from oldest videos...", parse_mode=enums.ParseMode.HTML)
+        
+        total_copied = 0
+        
+        for index, source_id in enumerate(groups, 1):
+            if source_id == dest_id or source_id == STORAGE_CHANNEL_ID or source_id == PREMIUM_CHANNEL_ID:
+                continue 
+                
+            try:
+                await status_msg.edit_text(f"⏳ <b>Cloning Group {index}/{total_groups}</b>\nID: <code>{source_id}</code>\nTotal Copied So Far: <b>{total_copied}</b>", parse_mode=enums.ParseMode.HTML)
+            except Exception: pass
+            
+            progress_res = await db_query(lambda: supabase.table('clone_progress').select('last_copied_id').eq('source_id', source_id).eq('dest_id', dest_id).execute())
+            last_copied_id = progress_res.data[0]['last_copied_id'] if progress_res.data else None
+            
+            video_ids = []
+            retries = 3
+            while retries > 0:
+                try:
+                    async for msg in client.search_messages(source_id, filter=enums.MessagesFilter.VIDEO):
+                        if last_copied_id and msg.id <= last_copied_id: continue
+                        video_ids.append(msg.id)
+                        if len(video_ids) % 100 == 0: await asyncio.sleep(0.1)
+                    break
+                except FloodWait as e:
+                    await asyncio.sleep(e.value + 1)
+                except Exception as e:
+                    err_msg = str(e).lower()
+                    if "disconnect" in err_msg or "connection" in err_msg or "timeout" in err_msg:
+                        retries -= 1
+                        video_ids = []
+                        await asyncio.sleep(5)
+                    else:
+                        break
+                        
+            if not video_ids:
+                continue
+                
+            video_ids.reverse() 
+            
+            for msg_id in video_ids:
+                copy_retries = 3
+                copy_success = False
+                while copy_retries > 0:
+                    try:
+                        await client.copy_message(chat_id=dest_id, from_chat_id=source_id, message_id=msg_id)
+                        total_copied += 1
+                        await save_progress(source_id, dest_id, msg_id)
+                        copy_success = True
+                        break
+                    except FloodWait as e:
+                        await asyncio.sleep(e.value + 2)
+                    except Exception as e:
+                        err_msg = str(e).lower()
+                        if "disconnect" in err_msg or "connection" in err_msg or "timeout" in err_msg:
+                            copy_retries -= 1
+                            await asyncio.sleep(3)
+                        else:
+                            break
+                await asyncio.sleep(2.5)
+                
+        await status_msg.edit_text(f"🎉 <b>Mass Cloning Completely Finished!</b>\n\nTotal Videos Copied from all groups: <b>{total_copied}</b>", parse_mode=enums.ParseMode.HTML)
+        
+    except Exception as e:
+        try: await status_msg.edit_text(f"❌ <b>Cloning Error:</b> {e}", parse_mode=enums.ParseMode.HTML)
+        except: pass
+
+@bot.on_message(filters.command("cloneall") & filters.private & filters.user(ADMIN_IDS))
+async def start_mass_cloning(client, message):
+    dest_id = -1003798479478 
+    status_msg = await message.reply(f"⏳ <b>Initializing mass cloning task to <code>{dest_id}</code>...</b>", parse_mode=enums.ParseMode.HTML)
+    asyncio.create_task(clone_all_background(client, dest_id, status_msg))
+
+
 @bot.on_message(filters.command("upload") & filters.private & filters.user(ADMIN_IDS))
 async def set_upload_mode(client, message):
     global upload_mode
@@ -1251,7 +1333,7 @@ async def auto_clean_channel_loop():
             print(f"Auto clean error: {e}")
         await asyncio.sleep(4 * 3600) 
 
-@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean", "sendto", "clone", "upload", "startshare", "stopshare", "help"]))
+@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean", "sendto", "clone", "cloneall", "upload", "startshare", "stopshare", "help"]))
 async def catch_admin_steps(client, message):
     state = admin_states.get(message.chat.id, {})
     if state.get("step") == 1: