Update app.py

app.py

@@ -23,7 +23,8 @@ start_flask()
 # =========================
 # ⚙️ CONFIG & UTILS
 # =========================
-BOT_TOKEN = os.getenv("tgtkn")
+# Agar env variable nahi milta to yaha apna token daal sakte ho testing ke liye
+BOT_TOKEN = os.getenv("tgtkn") 
 GROUP_ID = -1003799294466
 ADMIN_ID = 83939584939485
 MAX_STORAGE = 15360 * 1024 * 1024  # 15 GB max storage
@@ -39,9 +40,9 @@ def breadcrumb(path_list):
 
 def get_icon(filename):
     ext = filename.split('.')[-1].lower() if '.' in filename else ''
-    if ext in ['jpg', 'jpeg', 'png', 'gif']: return '🖼'
+    if ext in ['jpg', 'jpeg', 'png', 'gif', 'webp']: return '🖼'
     if ext in ['mp4', 'mkv', 'avi']: return '🎥'
-    if ext in ['mp3', 'wav', 'ogg']: return '🎵'
+    if ext in ['mp3', 'wav', 'ogg', 'm4a']: return '🎵'
     if ext in ['zip', 'rar', '7z']: return '🗜'
     if ext in ['pdf']: return '📕'
     if ext in ['txt', 'doc', 'docx']: return '📄'
@@ -108,7 +109,7 @@ async def send_main_menu(context: ContextTypes.DEFAULT_TYPE, uid: int):
         try:
             await context.bot.delete_message(chat_id=uid, message_id=last_menu_msg[uid])
         except Exception:
-            pass # Message pehle hi delete ho chuka hoga ya bot ko permission nahi hogi
+            pass # Message pehle hi delete ho chuka hoga ya permission nahi hogi
 
     msg = await context.bot.send_message(chat_id=uid, text=menu_text(uid), reply_markup=menu_kb())
     last_menu_msg[uid] = msg.message_id
@@ -130,7 +131,7 @@ def build_folder(uid, data, folder):
         cur = data["folders"][cur]["parent"]
     path.reverse()
 
-    text = f"📁 {breadcrumb(path)}\n\n"
+    text = f"📁 <b>{breadcrumb(path)}</b>\n\n"
     kb = []
 
     # Folders list
@@ -193,7 +194,7 @@ async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
         if q.data.startswith("open_"):
             folder = q.data.split("_", 1)[1]
             text, kb = build_folder(uid, data, folder)
-            return await q.message.edit_text(text, reply_markup=kb)
+            return await q.message.edit_text(text, parse_mode="HTML", reply_markup=kb)
 
         # Search Setup
         if q.data == "search":
@@ -206,7 +207,7 @@ async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
             folder = q.data.split("_", 1)[1]
             user_state[uid] = {"mode": "upload", "folder": folder}
             kb = [[InlineKeyboardButton("❌ Cancel", callback_data="cancel")]]
-            return await q.message.edit_text(f"📤 Apni image, video ya document yaha send karo (Folder: {folder})", reply_markup=InlineKeyboardMarkup(kb))
+            return await q.message.edit_text(f"📤 Apni image, video ya document yaha send karo (Folder: <b>{folder}</b>)", parse_mode="HTML", reply_markup=InlineKeyboardMarkup(kb))
 
         # View File
         if q.data.startswith("file_"):
@@ -228,12 +229,14 @@ async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
             f = data["index"][fid]
             ext = f["original_name"].lower().split('.')[-1]
 
-            if ext in ["jpg", "png", "jpeg", "webp"]:
+            if ext in ["jpg", "png", "jpeg", "webp", "gif"]:
                 await context.bot.send_photo(uid, f["file_id"])
             elif ext in ["mp4", "mkv", "avi"]:
                 await context.bot.send_video(uid, f["file_id"])
             elif ext in ["mp3", "wav", "ogg"]:
                 await context.bot.send_audio(uid, f["file_id"])
+            elif ext in ["voice", "oga"]:
+                await context.bot.send_voice(uid, f["file_id"])
             else:
                 await context.bot.send_document(uid, f["file_id"])
             return
@@ -243,9 +246,7 @@ async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
             fid = q.data.split("_", 1)[1]
             if fid in data["index"]:
                 del data["index"][fid]
-                # Remove from files list
                 data["files"] = [f for f in data["files"] if f["file_name"] != fid]
-                # Remove from folders
                 for f_name, f_data in data["folders"].items():
                     if fid in f_data["files"]:
                         f_data["files"].remove(fid)
@@ -272,14 +273,14 @@ async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
             save_data(uid, data)
             
             text, kb = build_folder(uid, data, parent)
-            return await q.message.edit_text(text, reply_markup=kb)
+            return await q.message.edit_text(text, parse_mode="HTML", reply_markup=kb)
 
         # Rename Folder Setup
         if q.data.startswith("renamefolder_"):
             folder = q.data.split("_", 1)[1]
             user_state[uid] = {"mode": "rename_folder", "folder": folder}
             kb = [[InlineKeyboardButton("❌ Cancel", callback_data="cancel")]]
-            return await q.message.edit_text(f"✏️ `{folder}` ke liye naya naam bhejo:", parse_mode="Markdown", reply_markup=InlineKeyboardMarkup(kb))
+            return await q.message.edit_text(f"✏️ <b>{folder}</b> ke liye naya naam bhejo:", parse_mode="HTML", reply_markup=InlineKeyboardMarkup(kb))
 
     except Exception as e:
         print("BTN ERROR:", e)
@@ -291,7 +292,7 @@ async def handle_file(update: Update, context: ContextTypes.DEFAULT_TYPE):
     try:
         uid = update.effective_user.id
         if uid not in user_state or user_state[uid].get("mode") != "upload":
-            await update.message.reply_text("❌ Upload karne ke liye pehle folder me jake 'Upload' pe click karo.")
+            await update.message.reply_text("❌ Upload karne ke liye pehle folder me jake 'Upload Here' pe click karo.")
             return
 
         state = user_state[uid]
@@ -302,7 +303,7 @@ async def handle_file(update: Update, context: ContextTypes.DEFAULT_TYPE):
         # Safely extract file properties
         if getattr(msg, 'document', None):
             doc = msg.document
-            original_name = doc.file_name or "document_file"
+            original_name = doc.file_name or f"document_{int(time.time())}"
         elif getattr(msg, 'photo', None):
             doc = msg.photo[-1]  # Highest resolution
             original_name = f"photo_{int(time.time())}.jpg"
@@ -341,9 +342,15 @@ async def handle_file(update: Update, context: ContextTypes.DEFAULT_TYPE):
         data["folders"][folder]["files"].append(name)
 
         save_data(uid, data)
-        user_state.pop(uid)
+        user_state.pop(uid, None) # Safe pop
+
+        # ✅ HTML use kar rahe hain taaki _ (underscore) ki wajah se markdown error na aaye
+        try:
+            await update.message.reply_text(f"✅ <b>{original_name}</b> successfully upload ho gayi!", parse_mode="HTML")
+        except Exception as e:
+            print(f"MSG ERROR: {e}")
+            await update.message.reply_text("✅ File successfully upload ho gayi!")
 
-        success_msg = await update.message.reply_text(f"✅ File **{original_name}** successfully upload ho gayi!", parse_mode="Markdown")
         time.sleep(1) # Chhota pause better user experience ke liye
         await send_main_menu(context, uid)
 
@@ -378,9 +385,9 @@ async def handle_text(update: Update, context: ContextTypes.DEFAULT_TYPE):
                 for r in results[:10]: # Top 10 results dikhayega
                     kb.append([InlineKeyboardButton(f"{get_icon(r['original_name'])} {r['original_name']}", callback_data=f"file_{r['file_name']}")])
                 kb.append([InlineKeyboardButton("❌ Clear Search", callback_data="cancel")])
-                await update.message.reply_text(f"🔍 Top results for '{text_input}':", reply_markup=InlineKeyboardMarkup(kb))
+                await update.message.reply_text(f"🔍 Top results for '<b>{text_input}</b>':", parse_mode="HTML", reply_markup=InlineKeyboardMarkup(kb))
             
-            user_state.pop(uid)
+            user_state.pop(uid, None)
             return
 
         # 📁 Create Folder Logic
@@ -394,9 +401,9 @@ async def handle_text(update: Update, context: ContextTypes.DEFAULT_TYPE):
                 data["folders"][name] = {"files": [], "folders": [], "parent": parent}
                 data["folders"][parent]["folders"].append(name)
                 save_data(uid, data)
-                await update.message.reply_text(f"✅ Folder **{name}** ban gaya!", parse_mode="Markdown")
+                await update.message.reply_text(f"✅ Folder <b>{name}</b> ban gaya!", parse_mode="HTML")
 
-            user_state.pop(uid)
+            user_state.pop(uid, None)
             return await send_main_menu(context, uid)
 
         # ✏️ Rename Folder Logic
@@ -416,24 +423,35 @@ async def handle_text(update: Update, context: ContextTypes.DEFAULT_TYPE):
                     data["folders"][sub]["parent"] = new_name
 
                 save_data(uid, data)
-                await update.message.reply_text(f"✅ Folder ka naam **{new_name}** ho gaya.", parse_mode="Markdown")
+                await update.message.reply_text(f"✅ Folder ka naam <b>{new_name}</b> ho gaya.", parse_mode="HTML")
 
-            user_state.pop(uid)
+            user_state.pop(uid, None)
             return await send_main_menu(context, uid)
 
     except Exception as e:
         print("TEXT ERROR:", e)
 
+# =========================
+# ⚠️ ERROR HANDLER
+# =========================
+async def error_handler(update: object, context: ContextTypes.DEFAULT_TYPE) -> None:
+    print(f"⚠️ EXCEPTION AAYA HAI: {context.error}")
+
 # =========================
 # 🚀 RUN
 # =========================
+if not BOT_TOKEN:
+    print("❌ ERROR: Bot token nahi mila! Apna token set karo.")
+    exit(1)
+
 app = ApplicationBuilder().token(BOT_TOKEN).build()
 
 app.add_handler(CommandHandler("start", start))
 app.add_handler(CallbackQueryHandler(buttons))
-# ✅ Naya Filter jo Photos, Videos, Documents aur Audio sab catch karega
+# ✅ Naya Filter jo Photos, Videos, Documents aur Audio sab catch karega bina kisi issue ke
 app.add_handler(MessageHandler(filters.ALL & ~filters.TEXT & ~filters.COMMAND, handle_file))
 app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_text))
+app.add_error_handler(error_handler)
 
-print("🔥 FINAL BOT RUNNING - ALL FIXED")
+print("🔥 FINAL BOT RUNNING - FULLY UPDATED & FIXED")
 app.run_polling()