Update app.py

app.py

@@ -91,32 +91,34 @@ bot_app = None
 bot_running = False
 bot_thread = None
 bot_logs = []
-
 MAX_LOGS = 20000
 
-# --- Logging for Bot ---
+# --- Logging ---
 def add_bot_log(entry):
     bot_logs.append(entry)
     if len(bot_logs) > MAX_LOGS:
         bot_logs.pop(0)
 
-# --- /start Command ---
+# --- Placeholder: You must define this elsewhere ---
+def execute_command(cmd):
+    return f"Executed: {cmd}"
+
+# --- /start Handler ---
 async def start_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await update.message.reply_text("Hello! I'm your terminal bot.\nUse /bash <command> to execute shell commands.")
     add_bot_log("[Bot] Received /start command.")
 
-# --- /bash Command ---
+# --- /bash Handler ---
 async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     cmd = ' '.join(context.args)
     if not cmd:
         await update.message.reply_text("Usage: /bash <command>")
         return
 
-    prefix = f"[Bot] $ {cmd}"
-    add_bot_log(prefix)
+    add_bot_log(f"[Bot] $ {cmd}")
 
     try:
-        result = execute_command(cmd)  # This must be defined elsewhere
+        result = execute_command(cmd)
     except Exception as e:
         result = f"Error: {e}"
 
@@ -131,32 +133,27 @@ def start_bot():
         return
 
     async def run_bot():
-        global bot_app
+        global bot_app, bot_running
+        add_bot_log("[Bot] Starting bot...")
         bot_app = ApplicationBuilder().token(BOT_TOKEN).build()
         bot_app.add_handler(CommandHandler("start", start_command))
         bot_app.add_handler(CommandHandler("bash", bash_command))
-        add_bot_log("[Bot] Starting bot...")
-
-        await bot_app.initialize()
-        await bot_app.start()
-        await bot_app.updater.start_polling()
-        await bot_app.updater.idle()
-        await bot_app.stop()
-        await bot_app.shutdown()
-        add_bot_log("[Bot] Bot has fully stopped.")
-        global bot_running
+        bot_running = True
+        await bot_app.run_polling()
+        add_bot_log("[Bot] Bot stopped.")
         bot_running = False
 
     def runner():
         try:
-            asyncio.new_event_loop().run_until_complete(run_bot())
+            asyncio.run(run_bot())
         except Exception as e:
             add_bot_log(f"[Bot Error] {e}")
+            global bot_running
+            bot_running = False
 
     bot_thread = threading.Thread(target=runner, daemon=True)
     bot_thread.start()
-    bot_running = True
-    add_bot_log("[Bot] Bot started.")
+    add_bot_log("[Bot] Bot thread started.")
 
 # --- Stop Bot ---
 def stop_bot():
@@ -166,22 +163,21 @@ def stop_bot():
         return
 
     async def shutdown():
-        await bot_app.updater.stop()
-        await bot_app.stop()
         await bot_app.shutdown()
+        await bot_app.stop()
         add_bot_log("[Bot] Bot stopped.")
         global bot_running
         bot_running = False
 
     threading.Thread(target=lambda: asyncio.run(shutdown()), daemon=True).start()
 
-# --- Bot
+# --- Optional: Live UI logs if used elsewhere ---
+def update_bot_logs():
+    return "\n".join(bot_logs[-100:])
 # --- UI Update Functions ---
 def update_terminal_logs():
     return "\n".join(terminal_logs[-100:])
 
-def update_bot_logs():
-    return "\n".join(bot_logs[-100:])
 
 def live_terminal(cmd):
     result = [f"$ {cmd}"]