Update bot/handlers.py

bot/handlers.py

@@ -9,7 +9,7 @@ from typing import Dict
 from hydrogram import Client, filters
 from hydrogram.types import Message, CallbackQuery
 
-from bot.config import Telegram, Workers
+from bot.config import Workers
 from bot.ui import texts
 from bot.ui.keyboards import profiles_keyboard, auth_menu_keyboard
 from bot.ui.callbacks import parse_cb, AUTH_JSON, AUTH_CI, CANCEL
@@ -78,6 +78,10 @@ def _pick_login_url(j: dict) -> str:
     )
 
 
+def _fmt_gb(b: float) -> float:
+    return float(b) / (1024.0**3)
+
+
 def setup_handlers(app: Client) -> None:
     @app.on_message(filters.command(["start"]) & filters.private)
     async def start_handler(_: Client, m: Message):
@@ -103,7 +107,7 @@ def setup_handlers(app: Client) -> None:
             return await safe_reply(m, "⏳ Wait 30s then try again.")
         _SPEED_COOLDOWN[uid] = now
 
-        msg = await safe_reply(m, "⚡ Running speedtest…")
+        msg = await safe_reply(m, "⚡ Running speed test…")
 
         # uptime
         up_sec = int(max(0, time.time() - _STARTED_AT))
@@ -111,47 +115,39 @@ def setup_handlers(app: Client) -> None:
 
         # disk
         d = disk_total_free("/")
-        total_gb = d["total"] / (1024**3)
-        free_gb = d["free"] / (1024**3)
+        total_gb = _fmt_gb(d["total"])
+        free_gb = _fmt_gb(d["free"])
 
         # run parallel
         dl_task = asyncio.create_task(net_download_test())
         up_task = asyncio.create_task(net_upload_test())
         p_task = asyncio.create_task(ping_ms())
 
-        dl = await dl_task
-        up = await up_task
-        p = await p_task
+        dl, up, p = await asyncio.gather(dl_task, up_task, p_task)
 
-        ping_val = int(round(p)) if p is not None else None
+        ping_line = f"{p:.0f} ms" if p is not None else "N/A"
 
-        dl_bps = float(dl.get("bps") or 0.0)
-        dl_bytes = float(dl.get("bytes") or 0.0)
-        dl_sec = float(dl.get("seconds") or 0.0)
+        dl_mb_s = bytes_per_sec_to_mb_s(dl["bps"])
+        up_mb_s = bytes_per_sec_to_mb_s(up["bps"])
 
-        up_bps = float(up.get("bps") or 0.0)
-        up_bytes = float(up.get("bytes") or 0.0)
-        up_sec = float(up.get("seconds") or 0.0)
-
-        dl_mb_s = bytes_per_sec_to_mb_s(dl_bps)
-        up_mb_s = bytes_per_sec_to_mb_s(up_bps)
+        dl_mb = bytes_to_mb(dl["bytes"])
+        up_mb = bytes_to_mb(up["bytes"])
 
         txt = (
-            "⚡ **Server Speed Test**\n\n"
-            "🕒 **Uptime**\n"
-            f"• {up_txt}\n\n"
-            "📡 **Network**\n"
-            f"• 🟢 Ping        : {ping_val if ping_val is not None else 'N/A'} ms\n"
-            f"• ⬇️ Download   : {dl_mb_s:.2f} MB/s\n"
-            f"  ↳ {bytes_to_mb(dl_bytes):.2f} MB in {dl_sec:.2f}s\n"
-            f"• ⬆️ Upload     : {up_mb_s:.2f} MB/s\n"
-            f"  ↳ {bytes_to_mb(up_bytes):.2f} MB in {up_sec:.2f}s\n\n"
-            "💾 **Storage**\n"
-            f"• Total Space   : {total_gb:.1f} GB\n"
-            f"• Free Space    : {free_gb:.1f} GB\n\n"
-            "🧪 _Measured directly from server (real MB/s, not Mbps)_"
+            "⚡ Server Speed Test\n\n"
+            "🕒 Uptime\n"
+            f"└ {up_txt}\n\n"
+            "📡 Network\n"
+            f"├ 🟢 Ping: {ping_line}\n"
+            f"├ ⬇️ Download: {dl_mb_s:.2f} MB/s\n"
+            f"│   └ {dl_mb:.2f} MB in {dl['seconds']:.2f}s\n"
+            f"└ ⬆️ Upload: {up_mb_s:.2f} MB/s\n"
+            f"    └ {up_mb:.2f} MB in {up['seconds']:.2f}s\n\n"
+            "💾 Storage\n"
+            f"├ Total: {total_gb:.1f} GB\n"
+            f"└ Free : {free_gb:.1f} GB\n\n"
+            "🧪 Measured from server (real MB/s, not Mbps)"
         )
-
         await safe_edit(msg, txt)
 
     # -------- OWNER allow/disallow via forward OR id --------
@@ -171,9 +167,7 @@ def setup_handlers(app: Client) -> None:
                 target = int(parts[1])
 
         if not target:
-            return await safe_reply(
-                m, "Usage:\n• Reply/forward user msg then /allow\n• or /allow <user_id>"
-            )
+            return await safe_reply(m, "Usage:\n• Reply/forward user msg then /allow\n• or /allow <user_id>")
 
         j = await allow_user(target)
         await safe_reply(m, f"✅ allowed: `{target}`\n`{j}`")
@@ -229,7 +223,7 @@ def setup_handlers(app: Client) -> None:
 
     @app.on_message(filters.command(["cancel"]) & filters.private)
     async def cancel_cmd(_: Client, m: Message):
-        _AWAIT_AUTH.pop(m.from_user.id if m.from_user else 0, None)
+        _AWAIT_AUTH.pop(m.from_user.id, None)
         await safe_reply(m, texts.CANCELLED)
 
     @app.on_callback_query()
@@ -314,17 +308,12 @@ def setup_handlers(app: Client) -> None:
             if not isinstance(j, dict):
                 return await safe_reply(m, f"❌ profile_add bad response: `{j}`")
 
-            if not j.get("ok") and not (
-                isinstance(j.get("data"), dict) and j["data"].get("ok")
-            ):
+            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)
             if not login_url:
-                return await safe_reply(
-                    m,
-                    f"❌ profile_add OK but login link missing.\nBackend response:\n`{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)
@@ -352,9 +341,7 @@ def setup_handlers(app: Client) -> None:
             ch = (p.get("channel_title") or "—").strip()
             cid = p.get("client_id_hint") or "—"
             sec = p.get("client_secret_hint") or "****…****"
-            connected = (
-                "✅ Connected" if (p.get("has_refresh") and p.get("channel_id")) else "⏳ Pending"
-            )
+            connected = "✅ Connected" if (p.get("has_refresh") and p.get("channel_id")) else "⏳ Pending"
             cur = "🟢 Current" if pid == default_id else ""
             txt += f"[{i}] {ch} | {cur} | id: {cid} | secret: {sec} | {connected}\n"
 
@@ -415,7 +402,7 @@ def setup_handlers(app: Client) -> None:
             dl_sec = max(0.001, time.time() - dl_t0)
 
             # fallback size from disk if TG didn't give it
-            if (not file_size) and file_path and os.path.exists(file_path):
+            if not file_size and file_path and os.path.exists(file_path):
                 try:
                     file_size = os.path.getsize(file_path)
                 except Exception: