Update app.py

app.py

@@ -81,6 +81,31 @@ def execute_command(cmd):
     return "\n".join(output)
 
 # --- Telegram Bot Handlers ---
+from telegram import Update
+from telegram.ext import ApplicationBuilder, CommandHandler, ContextTypes
+import threading
+import asyncio
+
+BOT_TOKEN = ""
+bot_app = None
+bot_running = False
+bot_thread = None
+bot_logs = []
+
+MAX_LOGS = 20000
+
+# --- Logging for Bot ---
+def add_bot_log(entry):
+    bot_logs.append(entry)
+    if len(bot_logs) > MAX_LOGS:
+        bot_logs.pop(0)
+
+# --- /start Command ---
+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 ---
 async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     cmd = ' '.join(context.args)
     if not cmd:
@@ -91,14 +116,14 @@ async def bash_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     add_bot_log(prefix)
 
     try:
-        result = execute_command(cmd)
+        result = execute_command(cmd)  # This must be defined elsewhere
     except Exception as e:
         result = f"Error: {e}"
 
     add_bot_log(result)
     await update.message.reply_text(f"$ {cmd}\n{result}")
 
-# --- Bot Start/Stop Logic ---
+# --- Start Bot ---
 def start_bot():
     global bot_app, bot_running, bot_thread, BOT_TOKEN
     if bot_running or not BOT_TOKEN:
@@ -108,32 +133,49 @@ def start_bot():
     async def run_bot():
         global bot_app
         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.run_polling()
+
+        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 = False
 
     def runner():
-        asyncio.run(run_bot())
+        try:
+            asyncio.new_event_loop().run_until_complete(run_bot())
+        except Exception as e:
+            add_bot_log(f"[Bot Error] {e}")
 
     bot_thread = threading.Thread(target=runner, daemon=True)
     bot_thread.start()
     bot_running = True
     add_bot_log("[Bot] Bot started.")
 
+# --- Stop Bot ---
 def stop_bot():
     global bot_app, bot_running
-    if not bot_running:
+    if not bot_running or not bot_app:
         add_bot_log("[Bot] Bot not running.")
         return
 
     async def shutdown():
-        await bot_app.shutdown()
+        await bot_app.updater.stop()
         await bot_app.stop()
+        await bot_app.shutdown()
         add_bot_log("[Bot] Bot stopped.")
+        global bot_running
+        bot_running = False
 
-    asyncio.run(shutdown())
-    bot_running = False
+    threading.Thread(target=lambda: asyncio.run(shutdown()), daemon=True).start()
 
+# --- Bot
 # --- UI Update Functions ---
 def update_terminal_logs():
     return "\n".join(terminal_logs[-100:])