Update bot/handlers.py

bot/handlers.py

@@ -1,5 +1,5 @@
 # PATH: bot/handlers.py
-import asyncio, json, re, time
+import json, re, time
 from typing import Dict
 
 from hydrogram import Client, filters
@@ -26,37 +26,33 @@ from bot.temp.files import cleanup_file
 
 from bot.youtube.uploader import upload_video
 
-# ✅ extra dns helper for /diag
 from bot.integrations.diag_extra import dns_check
-
-# ✅ robust fetch_status (optional). If not present, fallback to get_client().get()
-try:
-    from bot.integrations.http import fetch_status  # type: ignore
-except Exception:
-    async def fetch_status(url: str) -> str:
-        try:
-            from bot.integrations.http import get_client
-            c = get_client()
-            r = await c.get(url)
-            return str(r.status_code)
-        except Exception as e:
-            return f"ERR:{type(e).__name__}:{e}"
-
+from bot.integrations.http import fetch_status
 
 # ---------- in-memory auth state (simple FSM) ----------
-# values: "json" | "ci"
 _AWAIT_AUTH: Dict[int, str] = {}
 
 
 def _pick_login_url(j: dict) -> str:
-    """Backend sometimes returns loginUrl instead of login_url. Accept both."""
+    """Accept login_url from either top-level OR nested {data:{...}} shapes."""
     if not isinstance(j, dict):
         return ""
+
+    data = j.get("data") if isinstance(j.get("data"), dict) else {}
+
+    def _get(d: dict, k: str) -> str:
+        v = d.get(k)
+        return (v or "").strip() if isinstance(v, str) else ""
+
     return (
-        (j.get("login_url") or "").strip()
-        or (j.get("loginUrl") or "").strip()
-        or (j.get("auth_url") or "").strip()
-        or (j.get("url") or "").strip()
+        _get(j, "login_url")
+        or _get(j, "loginUrl")
+        or _get(j, "auth_url")
+        or _get(j, "url")
+        or _get(data, "login_url")
+        or _get(data, "loginUrl")
+        or _get(data, "auth_url")
+        or _get(data, "url")
     )
 
 
@@ -196,38 +192,34 @@ def setup_handlers(app: Client) -> None:
             return
 
         try:
-            # ---- parse credentials ----
             if mode == "json":
                 data = json.loads(m.text)
                 root = data.get("installed") or data.get("web") or {}
-                client_id = (root.get("client_id") or data.get("client_id") or "").strip()
-                client_secret = (root.get("client_secret") or data.get("client_secret") or "").strip()
+                client_id = root.get("client_id") or data.get("client_id")
+                client_secret = root.get("client_secret") or data.get("client_secret")
                 if not client_id or not client_secret:
                     return await safe_reply(m, texts.PARSE_FAIL)
             else:
-                txt = (m.text or "").strip()
+                txt = m.text.strip()
                 parts = [p.strip() for p in re.split(r"[|\n]+", txt) if p.strip()]
                 if len(parts) < 2:
                     return await safe_reply(m, texts.PARSE_FAIL)
                 client_id, client_secret = parts[0], parts[1]
 
-            # ---- call backend ----
             j = await profile_add(uid, client_id, client_secret, label="main", ttl_sec=600)
-            if not j.get("ok"):
+
+            if not isinstance(j, dict):
+                return await safe_reply(m, f"❌ profile_add bad response: `{j}`")
+
+            # ✅ handle both response shapes
+            if not j.get("ok") and not (isinstance(j.get("data"), dict) and j["data"].get("ok")):
                 return await safe_reply(m, texts.PROFILE_ADD_FAIL.format(j))
 
             login_url = _pick_login_url(j)
-            _AWAIT_AUTH.pop(uid, None)
-
             if not login_url:
-                # ✅ Do not crash; show backend response for debugging
-                return await safe_reply(
-                    m,
-                    "❌ profile_add OK but login link missing.\n"
-                    "Backend response:\n"
-                    f"`{j}`"
-                )
+                return await safe_reply(m, f"❌ profile_add OK but login link missing.\nBackend response:\n`{j}`")
 
+            _AWAIT_AUTH.pop(uid, None)
             await safe_reply(m, texts.SENT_AUTH_LINK + login_url)
 
         except Exception as e:
@@ -296,7 +288,7 @@ def setup_handlers(app: Client) -> None:
 
         file_path = ""
         try:
-            file_path, file_size, file_name = await download_to_temp(app_, m)
+            file_path, _file_size, file_name = await download_to_temp(app_, m)
             title, desc = extract_title_description(m, file_name)
 
             se = SpeedETA()