Update app.py

app.py

@@ -8,7 +8,7 @@ import urllib3
 from flask import Flask, jsonify, make_response, request
 from supabase import create_client
 from pyrogram import Client, filters, enums, idle
-from pyrogram.errors import SessionPasswordNeeded, PhoneCodeInvalid, PhoneCodeExpired, UserDeactivated, SessionRevoked, AuthKeyUnregistered
+from pyrogram.errors import SessionPasswordNeeded, PhoneCodeInvalid, PhoneCodeExpired, UserDeactivated, SessionRevoked, AuthKeyUnregistered, FloodWait
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInfo
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -259,7 +259,12 @@ async def bot_added_to_group(client, message):
     for member in message.new_chat_members:
         if member.id == me.id:
             try:
-                await db_query(lambda: supabase.table('groups').upsert({'group_id': message.chat.id}).execute())
+                await db_query(lambda: supabase.table('groups').upsert({
+                    'group_id': message.chat.id,
+                    'group_name': message.chat.title,
+                    'added_by': message.from_user.id if message.from_user else None
+                }).execute())
+                
                 group_name = message.chat.title
                 admin_msg = f"✅ <b>Bot added to a new group!</b>\n\n📌 <b>Group Name:</b> {group_name}\n🆔 <b>ID:</b> <code>{message.chat.id}</code>"
                 for admin_id in ADMIN_IDS:
@@ -267,6 +272,127 @@ async def bot_added_to_group(client, message):
                     except: pass
             except: pass
 
+@bot.on_message(filters.command("sendto") & filters.private & filters.user(ADMIN_IDS))
+async def send_to_specific_group(client, message):
+    if not message.reply_to_message:
+        return await message.reply("❌ <b>Please reply to a message, photo, or video that you want to send.</b>\n\nExample: `/sendto -1001234567890`")
+    
+    args = message.command
+    if len(args) < 2:
+        return await message.reply("❌ <b>Group ID missing!</b>\n\nCorrect format:\n`/sendto -1003973566529`")
+        
+    try:
+        group_id = int(args[1])
+        status = await message.reply("⏳ Sending message to group...")
+        
+        await message.reply_to_message.copy(chat_id=group_id)
+        await status.edit_text(f"✅ <b>Successfully sent to Group ID:</b> <code>{group_id}</code>", parse_mode=enums.ParseMode.HTML)
+    except Exception as e:
+        await status.edit_text(f"❌ <b>Failed to send!</b>\nError: {e}", parse_mode=enums.ParseMode.HTML)
+
+# ================= DATABASE PROGRESS-BASED CLONING =================
+async def save_progress(source_id, dest_id, msg_id):
+    try:
+        # ডাটাবেজে আগে থেকে প্রোগ্রেস আছে কিনা চেক করা হচ্ছে
+        res = await db_query(lambda: supabase.table('clone_progress').select('id').eq('source_id', source_id).eq('dest_id', dest_id).execute())
+        if res.data:
+            # থাকলে সেটা আপডেট হবে
+            await db_query(lambda: supabase.table('clone_progress').update({'last_copied_id': msg_id}).eq('id', res.data[0]['id']).execute())
+        else:
+            # না থাকলে নতুন রো ইনসার্ট হবে
+            await db_query(lambda: supabase.table('clone_progress').insert({'source_id': source_id, 'dest_id': dest_id, 'last_copied_id': msg_id}).execute())
+    except Exception as e:
+        print(f"Error saving progress: {e}")
+
+async def clone_videos_background(client, source_id, dest_id, status_msg):
+    try:
+        # ডাটাবেজে আগের কোনো সেভড প্রোগ্রেস আছে কিনা দেখা হচ্ছে
+        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 = None
+        if progress_res.data:
+            last_copied_id = progress_res.data[0]['last_copied_id']
+            await status_msg.edit_text(f"⏳ <b>Resuming clone task...</b>\nFound previous progress. Resuming after video ID <code>{last_copied_id}</code>...\nFetching video list from <code>{source_id}</code>...", parse_mode=enums.ParseMode.HTML)
+        else:
+            await status_msg.edit_text(f"⏳ <b>Cloning started!</b>\nFetching video list from <code>{source_id}</code>...\n<i>This might take a few minutes if the group has many videos.</i>", parse_mode=enums.ParseMode.HTML)
+        
+        video_ids = []
+        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) % 200 == 0:
+                await asyncio.sleep(0.1)
+        
+        if not video_ids:
+            if last_copied_id:
+                return await status_msg.edit_text("🎉 <b>All videos are already cloned!</b>\nNo new videos found in the source group.", parse_mode=enums.ParseMode.HTML)
+            else:
+                return await status_msg.edit_text("❌ <b>No videos found in the source group!</b>\n(Make sure the bot is an admin with read history permission in that group).", parse_mode=enums.ParseMode.HTML)
+            
+        video_ids.reverse() # Oldest to newest
+        total = len(video_ids)
+        
+        if last_copied_id:
+            await status_msg.edit_text(f"✅ Found <b>{total}</b> new videos to clone.\n🚀 Resuming background cloning from oldest to newest...", parse_mode=enums.ParseMode.HTML)
+        else:
+            await status_msg.edit_text(f"✅ Found <b>{total}</b> videos.\n🚀 Background cloning started from oldest to newest...", parse_mode=enums.ParseMode.HTML)
+        
+        success = 0
+        failed = 0
+        
+        for index, msg_id in enumerate(video_ids, 1):
+            try:
+                await client.copy_message(chat_id=dest_id, from_chat_id=source_id, message_id=msg_id)
+                success += 1
+                # সফলভাবে কপি হওয়ার সাথে সাথেই ডাটাবেজে প্রোগ্রেস সেভ
+                await save_progress(source_id, dest_id, msg_id)
+            except FloodWait as e:
+                await asyncio.sleep(e.value + 2)
+                try:
+                    await client.copy_message(chat_id=dest_id, from_chat_id=source_id, message_id=msg_id)
+                    success += 1
+                    await save_progress(source_id, dest_id, msg_id)
+                except Exception:
+                    failed += 1
+            except Exception:
+                failed += 1
+            
+            if index % 20 == 0 or index == total:
+                try:
+                    await status_msg.edit_text(f"⏳ <b>Cloning in progress... (Background)</b>\n\nTotal Videos to Copy: <b>{total}</b>\n✅ Copied: <b>{success}</b>\n❌ Failed: <b>{failed}</b>\nLast Video ID: <code>{msg_id}</code>", parse_mode=enums.ParseMode.HTML)
+                except FloodWait:
+                    pass
+                except Exception:
+                    pass
+            
+            await asyncio.sleep(2.5)
+            
+        await status_msg.edit_text(f"🎉 <b>Cloning Completely Finished!</b>\n\nSource: <code>{source_id}</code>\nTotal Copied: <b>{total}</b>\n✅ Successfully Copied: <b>{success}</b>\n❌ Failed: <b>{failed}</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("clone") & filters.private & filters.user(ADMIN_IDS))
+async def start_cloning(client, message):
+    args = message.command
+    if len(args) != 3:
+        return await message.reply("❌ <b>Invalid format!</b>\n\nUse: `/clone <Source_Group_ID> <Destination_Group_ID>`\nExample: `/clone -100123456789 -100987654321`", parse_mode=enums.ParseMode.HTML)
+        
+    try:
+        source_id = int(args[1])
+        dest_id = int(args[2])
+    except ValueError:
+        return await message.reply("❌ Chat IDs must be numbers.")
+        
+    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))
+
+# =================================================================
+
 @bot.on_message(filters.command("blur") & filters.private & filters.user(ADMIN_IDS))
 async def set_blur_state(client, message):
     try:
@@ -358,8 +484,8 @@ async def handle_media_upload(client, message):
     if media_type == "video":
         duration = message.video.duration if message.video and message.video.duration else 0
         file_size = message.video.file_size if message.video and message.video.file_size else 0
-        MAX_DURATION = 7200 # 2 Hours
-        MAX_SIZE = 1900 * 1024 * 1024 # 1.9 GB
+        MAX_DURATION = 7200 
+        MAX_SIZE = 1900 * 1024 * 1024 
 
         if duration > MAX_DURATION or file_size > MAX_SIZE:
             is_large_video = True
@@ -372,7 +498,6 @@ async def handle_media_upload(client, message):
     original_file, watermarked_file, blurred_file = None, None, None
     clean_upload_file, telegram_file, embed_link = None, None, None
     
-    # === Progress Bar Function ===
     last_update_time = time.time()
     async def download_progress(current, total):
         nonlocal last_update_time
@@ -384,13 +509,11 @@ async def handle_media_upload(client, message):
                 last_update_time = now
             except Exception:
                 pass
-    # =============================
     
     try:
         original_file = await message.download(progress=download_progress)
         clean_upload_file = original_file 
         
-        # ১. ওয়াটারমার্ক (Watermark) করা - Balanced (Superfast + CRF 23)
         if media_type == "video" and not is_large_video:
             await status_msg.edit_text("⏳ Watermarking video... (HD + Superfast Processing)")
             watermarked_file = f"{original_file}_wm.mp4"
@@ -405,7 +528,6 @@ async def handle_media_upload(client, message):
             if process.returncode == 0 and os.path.exists(watermarked_file): 
                 clean_upload_file = watermarked_file
 
-        # ২. byse.sx সার্ভারে HD / Clean ভিডিও আপলোড করা
         if media_type == "video":
             await status_msg.edit_text("⏳ Uploading Clean HD video to byse.sx server...")
             api_endpoint = "https://api.byse.sx/upload/server"
@@ -433,7 +555,6 @@ async def handle_media_upload(client, message):
             await status_msg.delete()
             return  
 
-        # ৩. টেলিগ্রামে পাঠানোর জন্য ভিডিও ব্লার করা
         telegram_file = clean_upload_file
         if is_blur and not is_large_video:
             await status_msg.edit_text(f"⏳ Applying {blur_percent}% blur for Telegram broadcast...")
@@ -501,6 +622,7 @@ async def handle_media_upload(client, message):
             tg_file_id = sent_to_admin.video.file_id
             
         await status_msg.delete()
+        
         groups_res = await db_query(lambda: supabase.table('groups').select('group_id').execute())
         group_ids = [g['group_id'] for g in groups_res.data]
         success_count, fail_count = 0, 0
@@ -512,7 +634,17 @@ async def handle_media_upload(client, message):
                 else: await client.send_video(gid, tg_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
                 success_count += 1
                 await asyncio.sleep(1.5)
-            except Exception: fail_count += 1 
+            except FloodWait as e:
+                await asyncio.sleep(e.value + 1)
+                try:
+                    if media_type == "photo": await client.send_photo(gid, tg_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
+                    elif media_type == "animation": await client.send_animation(gid, tg_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
+                    else: await client.send_video(gid, tg_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
+                    success_count += 1
+                except Exception:
+                    fail_count += 1
+            except Exception: 
+                fail_count += 1 
                 
         await message.reply(f"📢 <b>Broadcast Complete!</b>\n\n✅ Success: {success_count} groups\n❌ Failed: {fail_count} groups", parse_mode=enums.ParseMode.HTML)
         
@@ -561,6 +693,12 @@ async def process_broadcast(client, message):
                 await message.copy(chat_id=u['user_id'])
                 success += 1
                 await asyncio.sleep(0.15) 
+            except FloodWait as e:
+                await asyncio.sleep(e.value + 1)
+                try:
+                    await message.copy(chat_id=u['user_id'])
+                    success += 1
+                except Exception: failed += 1
             except Exception: failed += 1
                 
         await message.reply(f"✅ Broadcast Complete!\nSuccess: {success}\nFailed: {failed}")
@@ -624,6 +762,8 @@ async def manual_clean_channel(client, message):
                         except Exception: pass
                         
                 await asyncio.sleep(1.5) 
+            except FloodWait as e:
+                await asyncio.sleep(e.value + 1)
             except Exception:
                 pass
             
@@ -668,6 +808,8 @@ async def auto_clean_channel_loop():
                                     await bot.unban_chat_member(PREMIUM_CHANNEL_ID, user_id)
                                 except Exception: pass
                         await asyncio.sleep(2)
+                    except FloodWait as e:
+                        await asyncio.sleep(e.value + 1)
                     except Exception:
                         pass
         except Exception as e:
@@ -675,7 +817,7 @@ async def auto_clean_channel_loop():
         
         await asyncio.sleep(4 * 3600) 
 
-@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean"]))
+@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean", "sendto", "clone"]))
 async def catch_admin_steps(client, message):
     state = admin_states.get(message.chat.id, {})
     if state.get("step") == 1: