Update app.py

app.py

@@ -463,132 +463,120 @@ def execute_command(message):
 #         url="https://t.me/python3463_bot",
 #         status_code=status.HTTP_302_FOUND  # 302 is fine too
 #     )
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import HTMLResponse, FileResponse
-import requests, os, time, pathlib
-
-# ──────────────────────────────
-#  Config
-# ──────────────────────────────
-# BOT_TOKEN     = os.getenv("BOT_TOKEN")            # required
-BOT_USERNAME  = os.getenv("BOT_USERNAME", "live_logger_bot")
-AVATAR_TTL    = int(os.getenv("AVATAR_TTL", "3600"))  # seconds to keep avatar fresh
-DATA_DIR      = pathlib.Path("/tmp")              # change if you prefer
-AVATAR_PATH   = DATA_DIR / "bot_avatar.jpg"
-AVATAR_META   = {"ts": 0}                         # keeps timestamp of last download
-
-if not TOKEN:
-    raise RuntimeError("TOKEN environment variable not set")
-
-app = FastAPI(title="Telegram Bot Preview")
-
-
-# ──────────────────────────────
-#  Helper: refresh avatar if needed
-# ──────────────────────────────
-def refresh_avatar(force: bool = False) -> None:
-    """
-    Download the bot's avatar if it's missing or stale.
-    Saves it to AVATAR_PATH and updates AVATAR_META['ts'].
-    """
-    now = time.time()
-    if not force and AVATAR_PATH.exists() and now - AVATAR_META["ts"] < AVATAR_TTL:
-        return  # still fresh
+
+
+from fastapi import FastAPI, Response
+from fastapi.responses import HTMLResponse, StreamingResponse
+import requests, os, io
+
+app = FastAPI()
+
+BOT_TOKEN     = os.getenv("BOT_TOKEN")
+BOT_USERNAME  = os.getenv("BOT_USERNAME", "python3463_bot")
+FALLBACK_IMG  = "https://telegram.org/img/t_logo.png"
+
+if not BOT_TOKEN:
+    raise RuntimeError("BOT_TOKEN environment variable not set")
+
+TELEGRAM_API = f"https://api.telegram.org/bot{BOT_TOKEN}"
+
+
+def get_description() -> str:
+    """Try getMyShortDescription → fallback to getMyDescription → """""
+    try:
+        r = requests.get(f"{TELEGRAM_API}/getMyShortDescription").json()
+        if desc := r["result"].get("short_description"):
+            return desc
+    except: pass
 
     try:
-        # 1. get bot id
-        me = requests.get(f"https://api.telegram.org/bot{TOKEN}/getMe").json()
+        r = requests.get(f"{TELEGRAM_API}/getMyDescription").json()
+        if desc := r["result"].get("description"):
+            return desc
+    except: pass
+
+    return ""
+
+
+def fetch_avatar_bytes() -> bytes | None:
+    """Get latest profile photo of the bot as bytes (or None if unavailable)"""
+    try:
+        me = requests.get(f"{TELEGRAM_API}/getMe", timeout=5).json()
         user_id = me["result"]["id"]
 
-        # 2. get latest profile photo
         photos = requests.get(
-            f"https://api.telegram.org/bot{TOKEN}/getUserProfilePhotos",
+            f"{TELEGRAM_API}/getUserProfilePhotos",
             params={"user_id": user_id, "limit": 1},
-            timeout=5,
+            timeout=5
         ).json()
 
         if photos["result"]["total_count"] == 0:
-            return  # bot has no avatar
+            return None
 
-        file_id = photos["result"]["photos"][0][-1]["file_id"]  # biggest size
-
-        # 3. resolve file path
+        file_id = photos["result"]["photos"][0][-1]["file_id"]  # highest res
         file_obj = requests.get(
-            f"https://api.telegram.org/bot{TOKEN}/getFile",
+            f"{TELEGRAM_API}/getFile",
             params={"file_id": file_id},
-            timeout=5,
+            timeout=5
         ).json()
-        file_path = file_obj["result"]["file_path"]
-
-        # 4. download the actual image
-        file_url = f"https://api.telegram.org/file/bot{TOKEN}/{file_path}"
-        img_bytes = requests.get(file_url, timeout=10).content
-
-        DATA_DIR.mkdir(parents=True, exist_ok=True)
-        with open(AVATAR_PATH, "wb") as f:
-            f.write(img_bytes)
-
-        AVATAR_META["ts"] = now
-        print("Avatar refreshed")
-    except Exception as exc:
-        # If something goes wrong, keep the old one
-        print("Avatar refresh failed:", exc)
-
-
-# ──────────────────────────────
-#  Helper: bot description (once)
-# ──────────────────────────────
-def get_bot_description() -> str:
-    resp = requests.get(
-        f"https://api.telegram.org/bot{TOKEN}/getMyShortDescription"
-    ).json()
-    return resp["result"].get("short_description", "")
 
+        file_path = file_obj["result"]["file_path"]
+        file_url  = f"https://api.telegram.org/file/bot{BOT_TOKEN}/{file_path}"
+        response  = requests.get(file_url, timeout=10)
+        return response.content if response.status_code == 200 else None
 
-# ─────────────────────────��────
-#  Startup: fetch avatar once
-# ──────────────────────────────
-@app.on_event("startup")
-def on_startup():
-    refresh_avatar(force=True)
+    except Exception as e:
+        print("Avatar fetch failed:", e)
+        return None
 
 
-# ──────────────────────────────
-#  Route: preview card
-# ──────────────────────────────
-@app.get("/", include_in_schema=False, response_class=HTMLResponse)
+@app.get("/", include_in_schema=False)
 def preview():
-    refresh_avatar()  # refresh if stale
-
-    avatar_src = "/avatar.jpg" if AVATAR_PATH.exists() else "https://telegram.org/img/t_logo.png"
-    description = get_bot_description()
+    avatar_url = "/avatar.jpg"
+    description = get_description()
 
     html = f"""
     <html>
       <head>
-        <title>{BOT_USERNAME}</title>
+        <title>@{BOT_USERNAME}</title>
         <style>
           body {{
-            font-family: sans-serif; display: flex; justify-content: center;
-            padding: 40px; background: #f7f7f7;
+            font-family: sans-serif;
+            display: flex;
+            justify-content: center;
+            padding: 40px;
+            background: #f7f7f7;
           }}
           .card {{
-            max-width: 420px; background: #fff; padding: 24px; text-align: center;
-            border-radius: 12px; box-shadow: 0 4px 12px rgba(0,0,0,.1);
+            max-width: 420px;
+            background: #fff;
+            padding: 24px;
+            text-align: center;
+            border-radius: 12px;
+            box-shadow: 0 4px 12px rgba(0,0,0,.1);
           }}
           .avatar {{
-            width: 120px; height: 120px; border-radius: 50%; object-fit: cover;
+            width: 120px;
+            height: 120px;
+            border-radius: 50%;
+            object-fit: cover;
+            background: #ddd;
           }}
           .btn {{
-            display: inline-block; margin-top: 16px; padding: 12px 24px;
-            background: #2AABEE; color: #fff; border-radius: 8px;
-            text-decoration: none; font-weight: bold;
+            display: inline-block;
+            margin-top: 16px;
+            padding: 12px 24px;
+            background: #2AABEE;
+            color: #fff;
+            border-radius: 8px;
+            text-decoration: none;
+            font-weight: bold;
           }}
         </style>
       </head>
       <body>
         <div class="card">
-          <img src="{avatar_src}" alt="avatar" class="avatar">
+          <img src="{avatar_url}" alt="avatar" class="avatar">
           <h2>@{BOT_USERNAME}</h2>
           <p>{description}</p>
           <a class="btn" href="https://t.me/{BOT_USERNAME}" target="_blank">Start Bot</a>
@@ -599,15 +587,14 @@ def preview():
     return HTMLResponse(html)
 
 
-# ──────────────────────────────
-#  Route: serve avatar file
-# ──────────────────────────────
 @app.get("/avatar.jpg", include_in_schema=False)
-def avatar():
-    refresh_avatar()  # make sure it's fresh
-    if not AVATAR_PATH.exists():
-        raise HTTPException(status_code=404, detail="Avatar not found")
-    return FileResponse(AVATAR_PATH, media_type="image/jpeg")
+def serve_avatar():
+    img_bytes = fetch_avatar_bytes()
+    if img_bytes:
+        return StreamingResponse(io.BytesIO(img_bytes), media_type="image/jpeg")
+    # fallback
+    fallback = requests.get(FALLBACK_IMG)
+    return Response(content=fallback.content, media_type="image/png")
 
 
 @app.on_event("startup")