Update app.py

app.py

@@ -1,9 +1,7 @@
 import os
 import threading
 import time
-import hashlib
 import random
-import string
 from datetime import datetime
 
 from flask_srvr import run_flask
@@ -20,7 +18,7 @@ def start_flask():
     t.daemon = True
     t.start()
 
-#start_flask()
+start_flask()
 
 # =========================
 # ⚙️ CONFIG
@@ -28,7 +26,6 @@ def start_flask():
 BOT_TOKEN = os.getenv("tgtkn")
 GROUP_ID = -1003799294466
 MAX_STORAGE = 15 * 1024 * 1024 * 1024
-HARDCODE_ADMIN = 83939584939485
 
 # =========================
 # 🧠 STATE
@@ -46,7 +43,6 @@ def get_data(uid):
             "index": {},
             "folders": {
                 "root": {
-                    "name": "root",
                     "files": [],
                     "folders": []
                 }
@@ -57,29 +53,13 @@ def get_data(uid):
 def save_data(uid, data):
     mdb.set(f"user_{uid}", "json", data)
 
-def get_admins():
-    return mdb.get("admins", "json") or []
-
-def is_admin(uid):
-    return uid == HARDCODE_ADMIN or uid in get_admins()
-
 # =========================
 # 📊 STORAGE BAR
 # =========================
-def storage_bar(used, total, length=10):
+def storage_bar(used, total):
     ratio = used / total if total else 0
-    filled = int(ratio * length)
-    return "█" * filled + "░" * (length - filled)
-
-# =========================
-# 🧾 ICON
-# =========================
-def get_icon(name):
-    ext = name.lower().split('.')[-1]
-    if ext == "pdf": return "📄"
-    if ext in ["mp4","mkv"]: return "🎥"
-    if ext in ["jpg","png","jpeg"]: return "🖼"
-    return "📦"
+    filled = int(ratio * 10)
+    return "█"*filled + "░"*(10-filled)
 
 # =========================
 # 🏠 MENU
@@ -88,20 +68,16 @@ def main_menu(uid):
     data = get_data(uid)
     used = sum(f["file_size"] for f in data["files"])
 
-    bar = storage_bar(used, MAX_STORAGE)
-
     return f"""☁️ Cloud Bot
 
-📊 Storage:
-{bar}
+{storage_bar(used, MAX_STORAGE)}
 {round(used/1024/1024,2)} MB / 15360 MB
 """
 
 def main_kb():
     return InlineKeyboardMarkup([
         [InlineKeyboardButton("📤 Upload", callback_data="upload_root")],
-        [InlineKeyboardButton("📂 My Files", callback_data="open_root")],
-        [InlineKeyboardButton("🔍 Search", callback_data="search")]
+        [InlineKeyboardButton("📂 Files", callback_data="open_root")]
     ])
 
 # =========================
@@ -112,7 +88,7 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await update.message.reply_text(main_menu(uid), reply_markup=main_kb())
 
 # =========================
-# 📁 FOLDER VIEW
+# 📁 FOLDER UI
 # =========================
 def build_folder(data, folder):
     f = data["folders"][folder]
@@ -125,26 +101,13 @@ def build_folder(data, folder):
     for fid in f["files"]:
         file = data["index"][fid]
         kb.append([InlineKeyboardButton(
-            f"{get_icon(file['original_name'])} {file['original_name']}",
+            file["original_name"],
             callback_data=f"file_{fid}"
         )])
 
-    kb.append([
-        InlineKeyboardButton("➕ Folder", callback_data=f"newfolder_{folder}"),
-        InlineKeyboardButton("✏️ Rename", callback_data=f"renamefolder_{folder}")
-    ])
-
-    kb.append([
-        InlineKeyboardButton("🗑 Delete", callback_data=f"delfolder_{folder}")
-    ])
-
-    kb.append([
-        InlineKeyboardButton("📤 Upload", callback_data=f"upload_{folder}")
-    ])
-
-    kb.append([
-        InlineKeyboardButton("🔙 Back", callback_data="cancel")
-    ])
+    kb.append([InlineKeyboardButton("➕ Folder", callback_data=f"newfolder_{folder}")])
+    kb.append([InlineKeyboardButton("📤 Upload", callback_data=f"upload_{folder}")])
+    kb.append([InlineKeyboardButton("🔙 Back", callback_data="cancel")])
 
     return f"📁 {folder}", InlineKeyboardMarkup(kb)
 
@@ -152,135 +115,124 @@ def build_folder(data, folder):
 # 🔘 BUTTONS
 # =========================
 async def buttons(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    q = update.callback_query
-    await q.answer()
+    try:
+        q = update.callback_query
+        await q.answer()
 
-    uid = q.from_user.id
-    data = get_data(uid)
+        uid = q.from_user.id
+        data = get_data(uid)
 
-    # BACK
-    if q.data == "cancel":
-        user_state.pop(uid, None)
-        return await q.message.edit_text(main_menu(uid), reply_markup=main_kb())
+        # BACK
+        if q.data == "cancel":
+            user_state.pop(uid, None)
+            return await q.message.edit_text(main_menu(uid), reply_markup=main_kb())
 
-    # OPEN FOLDER
-    if q.data.startswith("open_"):
-        folder = q.data.split("_",1)[1]
-        text, kb = build_folder(data, folder)
-        return await q.message.edit_text(text, reply_markup=kb)
+        # OPEN FOLDER
+        if q.data.startswith("open_"):
+            folder = q.data.split("_",1)[1]
+            text, kb = build_folder(data, folder)
+            return await q.message.edit_text(text, reply_markup=kb)
 
-    # NEW FOLDER
-    if q.data.startswith("newfolder_"):
-        parent = q.data.split("_",1)[1]
-        user_state[uid] = {"mode":"new_folder","parent":parent}
-        return await q.message.edit_text("📁 Send folder name")
+        # UPLOAD
+        if q.data.startswith("upload_"):
+            folder = q.data.split("_",1)[1]
 
-    # RENAME FOLDER
-    if q.data.startswith("renamefolder_"):
-        folder = q.data.split("_",1)[1]
-        user_state[uid] = {"mode":"rename_folder","folder":folder}
-        return await q.message.edit_text("✏️ Send new folder name")
+            user_state[uid] = {"mode":"upload","folder":folder}
+            return await q.message.edit_text(f"📤 Upload to {folder}")
 
-    # DELETE FOLDER
-    if q.data.startswith("delfolder_"):
-        folder = q.data.split("_",1)[1]
+        # NEW FOLDER
+        if q.data.startswith("newfolder_"):
+            parent = q.data.split("_",1)[1]
 
-        code = str(random.randint(100000,999999))
-        user_state[uid] = {"mode":"delete_folder","folder":folder,"code":code}
+            user_state[uid] = {"mode":"new_folder","parent":parent}
+            return await q.message.edit_text("📁 Send folder name")
 
-        return await q.message.edit_text(f"Type code to delete:\n{code}")
+    except Exception as e:
+        print("ERROR:", e)
 
 # =========================
-# 📤 UPLOAD
+# 📤 FILE UPLOAD
 # =========================
 async def handle_file(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    uid = update.effective_user.id
+    try:
+        uid = update.effective_user.id
 
-    if uid not in user_state:
-        return
+        if uid not in user_state:
+            return
 
-    state = user_state[uid]
-    if state["mode"] != "upload":
-        return
+        state = user_state[uid]
+        if state["mode"] != "upload":
+            return
 
-    folder = state.get("folder","root")
-    data = get_data(uid)
+        folder = state["folder"]
+        data = get_data(uid)
 
-    doc = update.message.document
-    used = sum(f["file_size"] for f in data["files"])
+        doc = update.message.document
+        if not doc:
+            return
 
-    if not is_admin(uid) and used + doc.file_size > MAX_STORAGE:
-        return await update.message.reply_text("❌ Storage Full")
+        sent = await context.bot.send_document(GROUP_ID, doc.file_id)
 
-    sent = await context.bot.send_document(GROUP_ID, doc.file_id)
+        name = f"{uid}_{int(time.time())}"
+
+        entry = {
+            "file_name": name,
+            "original_name": doc.file_name,
+            "file_id": sent.document.file_id,
+            "file_size": doc.file_size,
+            "upload_date": str(datetime.now())
+        }
 
-    name = f"{uid}_{int(time.time())}"
+        data["files"].append(entry)
+        data["index"][name] = entry
+        data["folders"][folder]["files"].append(name)
 
-    entry = {
-        "file_name": name,
-        "original_name": doc.file_name,
-        "file_id": sent.document.file_id,
-        "file_size": doc.file_size,
-        "upload_date": str(datetime.now())
-    }
+        save_data(uid, data)
 
-    data["files"].append(entry)
-    data["index"][name] = entry
-    data["folders"][folder]["files"].append(name)
+        user_state.pop(uid)
 
-    save_data(uid, data)
+        await update.message.reply_text("✅ Uploaded", reply_markup=main_kb())
 
-    user_state.pop(uid)
-    await update.message.reply_text("✅ Uploaded", reply_markup=main_kb())
+    except Exception as e:
+        print("UPLOAD ERROR:", e)
 
 # =========================
-# 📝 TEXT HANDLER
+# 📝 TEXT
 # =========================
 async def handle_text(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    uid = update.effective_user.id
-
-    if uid not in user_state:
-        return
-
-    state = user_state[uid]
-    data = get_data(uid)
-
-    # CREATE FOLDER
-    if state["mode"] == "new_folder":
-        name = update.message.text
-        parent = state["parent"]
-
-        data["folders"][name] = {"name":name,"files":[],"folders":[]}
-        data["folders"][parent]["folders"].append(name)
+    try:
+        uid = update.effective_user.id
 
-        save_data(uid, data)
-        user_state.pop(uid)
+        if uid not in user_state:
+            return
 
-        return await update.message.reply_text("✅ Folder Created", reply_markup=main_kb())
+        state = user_state[uid]
+        data = get_data(uid)
 
-    # RENAME FOLDER
-    if state["mode"] == "rename_folder":
-        new = update.message.text
-        old = state["folder"]
+        if state["mode"] == "new_folder":
+            name = update.message.text
+            parent = state["parent"]
 
-        data["folders"][new] = data["folders"].pop(old)
+            data["folders"][name] = {"files": [], "folders": []}
+            data["folders"][parent]["folders"].append(name)
 
-        save_data(uid, data)
-        user_state.pop(uid)
-
-        return await update.message.reply_text("✅ Renamed", reply_markup=main_kb())
+            save_data(uid, data)
 
-    # DELETE FOLDER CONFIRM
-    if state["mode"] == "delete_folder":
-        if update.message.text == state["code"]:
-            folder = state["folder"]
+            user_state.pop(uid)
+            await update.message.reply_text("✅ Folder created", reply_markup=main_kb())
 
-            if data["folders"][folder]["files"] or data["folders"][folder]["folders"]:
-                return await update.message.reply_text("❌ Folder not empty")
+    except Exception as e:
+        print("TEXT ERROR:", e)
 
-            del data["folders"][folder]
+# =========================
+# 🚀 RUN
+# =========================
+app = ApplicationBuilder().token(BOT_TOKEN).build()
 
-            save_data(uid, data)
-            user_state.pop(uid)
+app.add_handler(CommandHandler("start", start))
+app.add_handler(CallbackQueryHandler(buttons))
+app.add_handler(MessageHandler(filters.Document.ALL, handle_file))
+app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_text))
 
-            return await update.message.reply_text("🗑 Deleted", reply_markup=main_kb())
+print("🔥 BOT RUNNING")
+app.run_polling()