Update app.py

app.py

@@ -16,22 +16,18 @@ from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInf
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-# Flask এর অপ্রয়োজনীয় socket.send() এরর লগস বন্ধ করার জন্য
 log = logging.getLogger('werkzeug')
 log.setLevel(logging.ERROR)
 
-# ==================== PYROGRAM NEW ID RANGE FIX (MONKEY PATCH) ====================
+# ==================== PYROGRAM NEW ID RANGE FIX ====================
 def get_peer_type_new(peer_id: int) -> str:
     peer_id_str = str(peer_id)
-    if not peer_id_str.startswith("-"):
-        return "user"
-    elif peer_id_str.startswith("-100"):
-        return "channel"
-    else:
-        return "chat"
+    if not peer_id_str.startswith("-"): return "user"
+    elif peer_id_str.startswith("-100"): return "channel"
+    else: return "chat"
 
 utils.get_peer_type = get_peer_type_new
-# ==================================================================================
+# ===================================================================
 
 # ================= CONFIGURATION =================
 BOT_TOKEN = os.environ.get("BOT_TOKEN")
@@ -393,7 +389,16 @@ async def start(client, message):
         await message.reply(welcome_text, parse_mode=enums.ParseMode.HTML, reply_markup=markup)
     except Exception as e: print(f"Start error: {e}")
 
-# ================= NEW: AUTO BROADCAST TO NEW GROUPS =================
+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}")
+
+# ================= FIXED: AUTO BROADCAST TO NEW GROUPS =================
 @bot.on_message(filters.new_chat_members)
 async def bot_added_to_group(client, message):
     me = client.me
@@ -404,46 +409,35 @@ async def bot_added_to_group(client, message):
     for member in message.new_chat_members:
         if member.id == me.id:
             try:
-                # 1. ডাটাবেজে গ্রুপ সেভ করা
                 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())
                 
-                # 2. এডমিনকে নোটিফিকেশন দেওয়া
                 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:
                     try: await client.send_message(chat_id=admin_id, text=admin_msg, parse_mode=enums.ParseMode.HTML)
                     except: pass
+
+                # Fetching the latest broadcasted video stored with marker dest_id = 0
+                progress_res = await db_query(lambda: supabase.table('clone_progress').select('source_id', 'last_copied_id').eq('dest_id', 0).execute())
                 
-                # 3. স্টোরেজ চ্যানেল থেকে সর্বশেষ ভিডিওটি নিয়ে এই গ্রুপে ব্রডকাস্ট করা
-                bot_link = f"https://t.me/{me.username}"
-                caption_text = f"🔥 <b>New Premium Viral Video Leaked!</b> 🔞\n\n🎬 <b>Watch HD Video Here:</b>\n👉 <b><a href='{bot_link}'>▶️ Click Here to Watch</a></b>\n\n👇 <i>Click the button below to open Bot!</i>"
-                group_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🎬 Watch Full Video Here 🔞", url=bot_link)]])
-
-                last_media_msg = None
-                async for msg in client.get_chat_history(STORAGE_CHANNEL_ID, limit=10):
-                    if msg.video or msg.photo or msg.animation or msg.document:
-                        last_media_msg = msg
-                        break
-                        
-                if last_media_msg:
-                    media_file_id = get_msg_file_id(last_media_msg)
-                    is_photo = bool(last_media_msg.photo)
+                if progress_res.data:
+                    last_record = progress_res.data[0]
+                    src_chat = last_record['source_id']
+                    msg_id = last_record['last_copied_id']
                     
-                    if media_file_id:
-                        # একটু অপেক্ষা করে মেসেজ পাঠানো (যাতে টেলিগ্রাম ��্প্যাম না ভাবে)
-                        await asyncio.sleep(2)
-                        if is_photo:
-                            await client.send_photo(message.chat.id, media_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
-                        else:
-                            await client.send_video(message.chat.id, media_file_id, caption=caption_text, parse_mode=enums.ParseMode.HTML, reply_markup=group_markup)
-                            
+                    bot_link = f"https://t.me/{me.username}"
+                    caption_text = f"🔥 <b>New Premium Viral Video Leaked!</b> 🔞\n\n🎬 <b>Watch HD Video Here:</b>\n👉 <b><a href='{bot_link}'>▶️ Click Here to Watch</a></b>\n\n👇 <i>Click the button below to open Bot!</i>"
+                    group_markup = InlineKeyboardMarkup([[InlineKeyboardButton("🎬 Watch Full Video Here 🔞", url=bot_link)]])
+                    
+                    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}")
-# =====================================================================
+# =======================================================================
 
 @bot.on_message(filters.command("sendto") & filters.private & filters.user(ADMIN_IDS))
 async def send_to_specific_group(client, message):
@@ -461,15 +455,6 @@ async def send_to_specific_group(client, message):
     except Exception as e:
         await status.edit_text(f"❌ <b>Failed to send!</b>\nError: {e}", parse_mode=enums.ParseMode.HTML)
 
-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())
@@ -852,6 +837,10 @@ async def handle_media_upload(client, message):
                     height=vid_height, 
                     thumb=thumb_path
                 )
+            
+            # সেভ করে রাখা হচ্ছে যাতে নতুন গ্রুপে এড হলে এই ভিডিওটা দিতে পারে
+            await save_progress(message.chat.id, 0, sent_to_admin.id)
+            
         except Exception as e:
             await message.reply(f"❌ Failed to send final file to you: {e}")
             return