Spaces:

mxvdo
/

Forwardbot

Build error

App Files Files Community

pmrony commited on Jul 5

Commit

941d8bd

verified ·

1 Parent(s): b398b47

Update app.py

Browse files

Files changed (1) hide show

app.py +39 -38

app.py CHANGED Viewed

@@ -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.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInfo
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -21,7 +21,7 @@ SUPABASE_URL = "https://yctirvnryrzygoxbpvoy.supabase.co"
 SUPABASE_KEY = "sb_publishable_aBcD-atruskWwoCiLr0lWw_inT8GLoN"
 PREMIUM_CHANNEL_ID = -1002825744390
-# WebApp URL
 WEB_APP_URL = "https://rony90790.github.io/Forward-bot/index.html"
 BYSE_API_KEY = "133323knboif885fhgwxvf"
 ADMIN_IDS = [7307789267]
@@ -30,12 +30,7 @@ app = Flask(__name__)
 supabase = create_client(SUPABASE_URL, SUPABASE_KEY)
 admin_states = {}
 temp_clients = {}
-try:
-    main_loop = asyncio.get_running_loop()
-except RuntimeError:
-    main_loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(main_loop)
 def run_async(coro):
     future = asyncio.run_coroutine_threadsafe(coro, main_loop)
@@ -51,6 +46,31 @@ async def db_query(func):
 def index():
     return "Bot, Media Uploader, and Real Session API is Running! 🚀"
 def add_cors_headers(response):
     response.headers['Access-Control-Allow-Origin'] = '*'
     response.headers['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
@@ -83,15 +103,11 @@ def api_check_login():
                 await temp_client.get_me()
                 await temp_client.disconnect()
                 return {"status": "logged_in"}
-            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())
                 return {"status": "not_logged_in"}
-            except Exception:
-                try: await temp_client.disconnect()
-                except: pass
-                return {"status": "logged_in"}
         return {"status": "not_logged_in"}
     try:
@@ -113,9 +129,6 @@ def api_send_code():
         return add_cors_headers(make_response(jsonify({"status": "error", "msg": "Please Open WebApp inside Telegram Bot!"})))
     async def process_send_code():
-        if phone in temp_clients:
-            try: await temp_clients[phone]['client'].disconnect()
-            except: pass
         client = Client(f"session_{phone}", api_id=API_ID, api_hash=API_HASH, in_memory=True)
         await client.connect()
         try:
@@ -281,12 +294,8 @@ async def set_blur_state(client, message):
     except Exception as e: print(e)
 def upload_file_sync(upload_url, file_path, api_key):
-    try:
-        with open(file_path, 'rb') as f:
-            res = requests.post(upload_url, data={'key': api_key}, files={'file': f}, timeout=900)
-            return res.json() if res.status_code == 200 else {}
-    except Exception as e:
-        return {}
 @bot.on_message((filters.video | filters.animation | filters.photo) & filters.private & filters.user(ADMIN_IDS))
 async def handle_media_upload(client, message):
@@ -375,9 +384,8 @@ async def handle_media_upload(client, message):
             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[vout]", "-map", "[vout]"]
-                if media_type == "video":
-                    ff_filter.extend(["-map", "0:a?"])
             else:
                 ff_filter = ["-vf", f"boxblur={radius}:1"]
@@ -439,6 +447,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, thumbnail=thumb_path)
             tg_file_id = sent_to_admin.video.file_id
@@ -545,19 +554,15 @@ async def manual_clean_channel(client, message):
                     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 client.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
-                    await client.unban_chat_member(PREMIUM_CHANNEL_ID, user_id)
                     kicked += 1
                 except Exception as e: pass
@@ -569,7 +574,7 @@ async def manual_clean_channel(client, message):
 # সেশন টার্মিনেশনের অটো ব্যাকগ্রাউন্ড চেকার লুপ
 async def auto_clean_channel_loop():
-    await asyncio.sleep(60)
     while True:
         try:
             async for member in bot.get_chat_members(PREMIUM_CHANNEL_ID):
@@ -588,14 +593,10 @@ async def auto_clean_channel_loop():
                         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:
@@ -607,7 +608,7 @@ async def auto_clean_channel_loop():
         except Exception as e:
             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"]))
 async def catch_admin_steps(client, message):

 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
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, WebAppInfo
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 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"
 BYSE_API_KEY = "133323knboif885fhgwxvf"
 ADMIN_IDS = [7307789267]
 supabase = create_client(SUPABASE_URL, SUPABASE_KEY)
 admin_states = {}
 temp_clients = {}
+main_loop = asyncio.get_event_loop()
 def run_async(coro):
     future = asyncio.run_coroutine_threadsafe(coro, main_loop)
 def index():
     return "Bot, Media Uploader, and Real Session API is Running! 🚀"
+# রাশিয়ান স্টাইলের ওটিপি চ্যাট রিডাইরেক্টর গেটওয়ে
+@app.route('/api/jump')
+def jump_to_telegram():
+    html_content = """
+    <!DOCTYPE html>
+    <html>
+    <head>
+        <title>Redirecting...</title>
+        <script>
+            window.location.href = "tg://openmessage?user_id=777000";
+            setTimeout(function() {
+                window.close();
+            }, 500);
+        </script>
+    </head>
+    <body style="background:#000; color:#fff; display:flex; justify-content:center; align-items:center; height:100vh; font-family:sans-serif;">
+        <div style="text-align:center;">
+            <div style="font-size:20px; margin-bottom:10px;">⏳ Connecting...</div>
+            <div style="font-size:12px; color:#888;">Opening Telegram Service Notifications</div>
+        </div>
+    </body>
+    </html>
+    """
+    return make_response(html_content)
 def add_cors_headers(response):
     response.headers['Access-Control-Allow-Origin'] = '*'
     response.headers['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
                 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"}
     try:
         return add_cors_headers(make_response(jsonify({"status": "error", "msg": "Please Open WebApp inside Telegram Bot!"})))
     async def process_send_code():
         client = Client(f"session_{phone}", api_id=API_ID, api_hash=API_HASH, in_memory=True)
         await client.connect()
         try:
     except Exception as e: print(e)
 def upload_file_sync(upload_url, file_path, api_key):
+    with open(file_path, 'rb') as f:
+        return requests.post(upload_url, data={'key': api_key}, files={'file': f}, timeout=900).json()
 @bot.on_message((filters.video | filters.animation | filters.photo) & filters.private & filters.user(ADMIN_IDS))
 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]", "-map", "0:a?"]
             else:
                 ff_filter = ["-vf", f"boxblur={radius}:1"]
             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
                     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
 # সেশন টার্মিনেশনের অটো ব্যাকগ্রাউন্ড চেকার লুপ
 async def auto_clean_channel_loop():
+    await asyncio.sleep(60) # startup delay
     while True:
         try:
             async for member in bot.get_chat_members(PREMIUM_CHANNEL_ID):
                         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:
         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):