Update app.py

app.py

@@ -8,7 +8,7 @@ from aiohttp import web
 from dotenv import load_dotenv
 load_dotenv()
 
-# ⚡ ENTERPRISE FIX: Import 'idle' correctly
+# ⚡ Import 'idle' correctly to keep the bot listening
 from pyrogram import idle 
 
 # Strict Environment Validation Framework
@@ -24,11 +24,10 @@ from bot.database import db
 from bot.state import state
 from bot.client import bot, init_clients
 from bot.scheduler import scheduler, shutdown_campers
-
-# ⚡ FINAL FIX: Import the scraper to initialize its aiohttp session
 from bot.scraper import scraper
 
 async def handle_ping(request):
+    """OPSEC Decoy server to satisfy PaaS port requirements."""
     return web.json_response({"error": "Forbidden", "status": 403}, status=403)
 
 async def keep_alive_server():
@@ -49,7 +48,23 @@ async def safe_boot_sequence():
         await db.init_db()
         await db.load_settings(state)
         
-        # ⚡ THE FINAL FIX: Boot up the Scraper's HTTP pool
+        # ⚡ Load Admins from Environment and Database
+        if "admin_ids" not in state:
+            state["admin_ids"] = set()
+            
+        env_admins = os.environ.get("ADMIN_IDS", "")
+        if env_admins:
+            for x in env_admins.split(","):
+                if x.strip().lstrip('-').isdigit():
+                    state["admin_ids"].add(int(x.strip()))
+                    
+        db_admins = await db.get_admins()
+        for adm in db_admins:
+            state["admin_ids"].add(adm)
+            
+        log(f"🔑 Authorization loaded for {len(state['admin_ids'])} admins.")
+        
+        # Boot up the Scraper's HTTP pool
         await scraper.init_session()
         
         # Load Target Queues
@@ -61,6 +76,25 @@ async def safe_boot_sequence():
         for u in custom_snipes:
             if u not in temp_s: temp_s.append(u)
             
+        # ⚡ Restore Watchdog and Fragment Lists from MongoDB
+        if "watch_submitters" not in state:
+            state["watch_submitters"] = {}
+        if "watchdog_queue" not in state:
+            state["watchdog_queue"] = set()
+        if "fragcheck_queue" not in state:
+            state["fragcheck_queue"] = set()
+            
+        watchdog_data = await db.get_watchdog()
+        for u, user_id in watchdog_data.items():
+            state["watchdog_queue"].add(u)
+            state["watch_submitters"][u] = user_id
+            
+        frag_data = await db.get_fragcheck()
+        for u in frag_data:
+            state["fragcheck_queue"].add(u)
+            
+        log(f"📥 Restored {len(state['watchdog_queue'])} Watchdog targets & {len(state['fragcheck_queue'])} Fragment targets from Database.")
+            
         if state["db_filter_on"]:
             before = len(temp_c)
             temp_c = [u for u in temp_c if u not in state["unavailable_set"]]
@@ -81,7 +115,7 @@ async def safe_boot_sequence():
         # Initialize UI Bot
         await bot.start()
         
-        # ⚡ CRITICAL FIX: Alias handlers to avoid shadowing the global 'bot'
+        # Alias handlers to link your commands and buttons to the active bot
         import bot.handlers as ui_handlers
         
         # Initialize Snipe Fleet
@@ -97,11 +131,12 @@ async def safe_boot_sequence():
 async def main():
     try:
         boot_success = await safe_boot_sequence()
-        if not boot_success: return
+        if not boot_success: 
+            return
 
         from bot.scheduler import account_status_job, schedule_next, watchdog_cycle, reset_hourly_counters, flush_stats_to_db
         
-        # Engine Jobs
+        # Start Background Engines
         scheduler.add_job(account_status_job, "interval", minutes=1)
         scheduler.add_job(watchdog_cycle, "interval", seconds=3)
         scheduler.add_job(reset_hourly_counters, "cron", minute=0)
@@ -115,7 +150,10 @@ async def main():
         from bot.handlers import sync_fleet
         await sync_fleet()
 
-        # ⚡ ENTERPRISE FIX: Run both concurrently
+        from bot.alerts import alert_admin
+        await alert_admin("🟢 <b>Enterprise System Online</b>\nAll modules restored and listening.")
+
+        # ⚡ ENTERPRISE FIX: Run both concurrently so the bot actively listens to buttons
         await asyncio.gather(
             keep_alive_server(),
             idle()
@@ -126,11 +164,14 @@ async def main():
     finally:
         log("🛑 Initiating Graceful Shutdown...")
         shutdown_campers()
-        for acc in state["account_pool"]:
-            if getattr(acc.client, "is_connected", False): await acc.client.stop()
-        if getattr(bot, "is_connected", False): await bot.stop()
         
-        # Shutdown scraper session gracefully
+        for acc in state["account_pool"]:
+            if getattr(acc.client, "is_connected", False): 
+                await acc.client.stop()
+                
+        if getattr(bot, "is_connected", False): 
+            await bot.stop()
+            
         await scraper.close_session()
 
 if __name__ == "__main__":