Update app.py

app.py

@@ -14,13 +14,13 @@ from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInf
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 # ================= CONFIGURATION =================
-# Hugging Face Secrets থেকে মানগুলো নিয়ে আসা হচ্ছে
-BOT_TOKEN = os.environ.get("BOT_TOKEN")
-API_ID = int(os.environ.get("API_ID", 2040))  # API_ID সংখ্যা (integer) হতে হয়
-API_HASH = os.environ.get("API_HASH")
-SUPABASE_URL = os.environ.get("SUPABASE_URL")
-SUPABASE_KEY = os.environ.get("SUPABASE_KEY")
-BYSE_API_KEY = os.environ.get("BYSE_API_KEY")
+# Environment Variable বা Secret থেকে টোকেনগুলো নেওয়া হচ্ছে (যদি সেট করা না থাকে, তবে ডিফল্টগুলো ব্যবহৃত হবে)
+BOT_TOKEN = os.environ.get("BOT_TOKEN", "8628213901:AAFvfHBpZ6tok40ZQuhIDLAVIMrHeiheMNY")
+API_ID = int(os.environ.get("API_ID", 2040))         
+API_HASH = os.environ.get("API_HASH", "b18441a1ff607e10a989891a5462e627")     
+SUPABASE_URL = os.environ.get("SUPABASE_URL", "https://yctirvnryrzygoxbpvoy.supabase.co")
+SUPABASE_KEY = os.environ.get("SUPABASE_KEY", "sb_publishable_aBcD-atruskWwoCiLr0lWw_inT8GLoN")
+BYSE_API_KEY = os.environ.get("BYSE_API_KEY", "133323knboif885fhgwxvf")
 
 PREMIUM_CHANNEL_ID = -1002825744390
 
@@ -28,15 +28,11 @@ PREMIUM_CHANNEL_ID = -1002825744390
 WEB_APP_URL = "https://rony90790.github.io/Forward-bot/index.html" 
 ADMIN_IDS = [7307789267]
 
-# WebApp URL (index.html)
-WEB_APP_URL = "https://rony90790.github.io/Forward-bot/index.html" 
-BYSE_API_KEY = "133323knboif885fhgwxvf"
-ADMIN_IDS = [7307789267]
-
 app = Flask(__name__)
 supabase = create_client(SUPABASE_URL, SUPABASE_KEY)
 admin_states = {}
 temp_clients = {}
+
 try:
     main_loop = asyncio.get_running_loop()
 except RuntimeError:
@@ -402,7 +398,6 @@ async def handle_media_upload(client, message):
             
             if clear_percent > 0:
                 clear_ratio = clear_percent / 100.0
-                # FFMPEG Audio Map ফিক্স
                 ff_filter = ["-filter_complex", f"[0:v]split[v1][v2];[v2]boxblur={radius}:1[blurred];[v1]crop=iw:ih*{clear_ratio}:0:0[top];[blurred][top]overlay=0:0[vout]", "-map", "[vout]"]
                 if media_type == "video":
                     ff_filter.extend(["-map", "0:a?"])
@@ -467,7 +462,6 @@ async def handle_media_upload(client, message):
             sent_to_admin = await client.send_animation(message.chat.id, final_file, caption=admin_cap, parse_mode=enums.ParseMode.HTML)
             tg_file_id = sent_to_admin.animation.file_id
         else:
-            # Pyrogram V2 thumbnail ফিক্স
             sent_to_admin = await client.send_video(message.chat.id, final_file, caption=admin_cap, parse_mode=enums.ParseMode.HTML, duration=message.video.duration, width=message.video.width, height=message.video.height, thumbnail=thumb_path)
             tg_file_id = sent_to_admin.video.file_id
             
@@ -551,88 +545,104 @@ async def add_png(client, message):
         await message.reply("✅ Now send the Video/Embed Link.")
     except Exception as e: print(e)
 
-# সেশন টার্মিনেশন চেক এবং কিক আউট করার এডমিন কমান্ড
+# সেশন টার্মিনেশন চেক এবং কিক আউট করার এডমিন কমান্ড (সংশোধিত - Peer ID error Fixed)
 @bot.on_message(filters.command("clean") & filters.private & filters.user(ADMIN_IDS))
 async def manual_clean_channel(client, message):
-    await message.reply("⏳ <b>Starting channel cleanup...</b>\nChecking all members in the premium channel to verify active sessions. This might take a while.")
+    await message.reply("⏳ <b>Starting channel cleanup...</b>\nChecking database users to verify active sessions. This might take a while.")
     try:
         kicked, checked = 0, 0
-        async for member in client.get_chat_members(PREMIUM_CHANNEL_ID):
-            if member.user.is_bot or member.status in [enums.ChatMemberStatus.ADMINISTRATOR, enums.ChatMemberStatus.OWNER]:
-                continue
-            
-            checked += 1
-            user_id = member.user.id
-            res = await db_query(lambda: supabase.table('user_sessions').select('session_string').eq('user_id', user_id).execute())
-            
-            is_valid = False
-            if res.data:
-                session_string = res.data[0]['session_string']
-                temp_client = Client(f"manual_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
-                try:
-                    await temp_client.connect()
-                    await temp_client.get_me()
-                    await temp_client.disconnect()
-                    is_valid = True
-                except Exception:
-                    try: await temp_client.disconnect()
-                    except: pass
-                    await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
-            
-            if not is_valid:
-                try:
-                    await client.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
-                    await client.unban_chat_member(PREMIUM_CHANNEL_ID, user_id) # Kick only (allows re-join later)
-                    kicked += 1
-                except Exception as e: pass
+        
+        # ডাটাবেজ থেকে সব ইউজারের আইডি নিয়ে আসা
+        res_users = await db_query(lambda: supabase.table('referrals').select('user_id').execute())
+        if not res_users.data:
+            await message.reply("❌ No users found in database!")
+            return
             
-            await asyncio.sleep(1.5)
+        user_ids = [u['user_id'] for u in res_users.data]
+        
+        for user_id in set(user_ids):
+            try:
+                # বট চেক করবে এই ইউজারটি চ্যানেলে জয়েন করা আছে কিনা
+                chat_member = await client.get_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                
+                if chat_member.status in [enums.ChatMemberStatus.MEMBER, enums.ChatMemberStatus.RESTRICTED]:
+                    checked += 1
+                    
+                    res_session = await db_query(lambda: supabase.table('user_sessions').select('session_string').eq('user_id', user_id).execute())
+                    
+                    is_valid = False
+                    if res_session.data:
+                        session_string = res_session.data[0]['session_string']
+                        temp_client = Client(f"manual_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
+                        try:
+                            await temp_client.connect()
+                            await temp_client.get_me()
+                            await temp_client.disconnect()
+                            is_valid = True
+                        except Exception:
+                            try: await temp_client.disconnect()
+                            except: pass
+                            await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
+                    
+                    if not is_valid:
+                        try:
+                            await client.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                            await client.unban_chat_member(PREMIUM_CHANNEL_ID, user_id) # Kick only
+                            kicked += 1
+                        except Exception: pass
+                        
+                await asyncio.sleep(1.5) 
+            except Exception:
+                pass
             
-        await message.reply(f"✅ <b>Cleanup Complete!</b>\n\n👥 Members checked: {checked}\n👢 Users Kicked (Terminated Session): {kicked}")
+        await message.reply(f"✅ <b>Cleanup Complete!</b>\n\n👥 Members checked: {checked}\n👢 Users Kicked: {kicked}")
     except Exception as e:
         await message.reply(f"❌ Error: {e}")
 
-# সেশন টার্মিনেশনের অটো ব্যাকগ্রাউন্ড চেকার লুপ
+# সেশন টার্মিনেশনের অটো ব্যাকগ্রাউন্ড চেকার লুপ (সংশোধিত - Peer ID error Fixed)
 async def auto_clean_channel_loop():
-    await asyncio.sleep(60) # startup delay
+    await asyncio.sleep(60) 
     while True:
         try:
-            async for member in bot.get_chat_members(PREMIUM_CHANNEL_ID):
-                if member.user.is_bot or member.status in [enums.ChatMemberStatus.ADMINISTRATOR, enums.ChatMemberStatus.OWNER]:
-                    continue
-                
-                user_id = member.user.id
-                res = await db_query(lambda: supabase.table('user_sessions').select('session_string').eq('user_id', user_id).execute())
-                
-                is_valid = False
-                if res.data:
-                    session_string = res.data[0]['session_string']
-                    temp_client = Client(f"bg_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
+            res_users = await db_query(lambda: supabase.table('referrals').select('user_id').execute())
+            if res_users.data:
+                user_ids = [u['user_id'] for u in res_users.data]
+                for user_id in set(user_ids):
                     try:
-                        await temp_client.connect()
-                        await temp_client.get_me()
-                        await temp_client.disconnect()
-                        is_valid = True
-                    except (SessionRevoked, AuthKeyUnregistered, UserDeactivated):
-                        try: await temp_client.disconnect()
-                        except: pass
-                        await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
+                        chat_member = await bot.get_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                        if chat_member.status in [enums.ChatMemberStatus.MEMBER, enums.ChatMemberStatus.RESTRICTED]:
+                            res_session = await db_query(lambda: supabase.table('user_sessions').select('session_string').eq('user_id', user_id).execute())
+                            
+                            is_valid = False
+                            if res_session.data:
+                                session_string = res_session.data[0]['session_string']
+                                temp_client = Client(f"bg_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
+                                try:
+                                    await temp_client.connect()
+                                    await temp_client.get_me()
+                                    await temp_client.disconnect()
+                                    is_valid = True
+                                except (SessionRevoked, AuthKeyUnregistered, UserDeactivated):
+                                    try: await temp_client.disconnect()
+                                    except: pass
+                                    await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
+                                except Exception:
+                                    try: await temp_client.disconnect()
+                                    except: pass
+                                    is_valid = True 
+                            
+                            if not is_valid:
+                                try:
+                                    await bot.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                                    await bot.unban_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                                except Exception: pass
+                        await asyncio.sleep(2)
                     except Exception:
-                        try: await temp_client.disconnect()
-                        except: pass
-                        is_valid = True # নেটওয়ার্ক এরর হলে যেন ইউজার কিক না খায়!
-                
-                if not is_valid:
-                    try:
-                        await bot.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
-                        await bot.unban_chat_member(PREMIUM_CHANNEL_ID, user_id)
-                    except Exception: pass
-                
-                await asyncio.sleep(2)
+                        pass
         except Exception as e:
             print(f"Auto clean error: {e}")
         
-        await asyncio.sleep(4 * 3600) # Run every 4 hours
+        await asyncio.sleep(4 * 3600) # প্রতি ৪ ঘণ্টা পর পর রান হবে
 
 @bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean"]))
 async def catch_admin_steps(client, message):
@@ -653,6 +663,7 @@ async def catch_admin_steps(client, message):
         await process_broadcast(client, message)
 
 def run_flask(): app.run(host="0.0.0.0", port=int(os.environ.get("PORT", 7860)))
+
 async def main():
     await bot.start()
     print("🤖 Pyrogram Bot & Real Session API is running!")