Update app.py

app.py

@@ -173,6 +173,7 @@ def generate_ai_questions(topic, num_questions=5, gid=None, questions_db=None):
     ]
 
     RULES:
+    -Different questions
     - ONLY valid JSON array.
     - No extra text.
     - No markdown.
@@ -517,7 +518,7 @@ def show_game_leaderboard(game_id):
 
         # 2️⃣ Online CSV (Global Public CSV File)
         try:
-            ONLINE_CSV_URL = "https://yourdomain.com/leaderboard_online.csv"  
+            ONLINE_CSV_URL = "leaderboard_online.csv"  
             online_df = pd.read_csv(ONLINE_CSV_URL)
 
             if "game_id" in online_df.columns:
@@ -557,17 +558,28 @@ def show_game_leaderboard(game_id):
 # ---------------------------
 # Get weekly leaderboard
 # ---------------------------
-def get_weekly_leaderboard(limit=10):
+def get_weekly_leaderboard(limit=10, game_id=None):
     """
-    Returns top scores for the current week (Mon–Sun UTC)
+    Returns top scores for current week (UTC)
+    Optional: filter by game_id
     """
+
     mode = st.session_state.get("mode_selection", "Offline")
     rows = []
 
+    # ---------------- ONLINE MODE ----------------
     if mode == "Online":
         ok, _ = init_firebase_if_needed()
         if ok:
-            rows = fb_get("/leaderboard") or []
+            fb_rows = fb_get("/leaderboard") or []
+
+            # 🔥 FIX: Convert dict → list safely
+            if isinstance(fb_rows, dict):
+                fb_rows = list(fb_rows.values())
+
+            rows.extend(fb_rows)
+
+    # ---------------- OFFLINE MODE ----------------
     else:
         try:
             rows = pd.read_csv(LEADERBOARD_FILE).to_dict("records")
@@ -577,44 +589,77 @@ def get_weekly_leaderboard(limit=10):
     if not rows:
         return []
 
-    # Convert timestamps safely to UTC
+    # 🔥 Convert timestamps safely
     for r in rows:
         ts = r.get("timestamp")
-        if ts:
-            r["timestamp"] = pd.to_datetime(ts, errors="coerce", utc=True)
+        r["timestamp"] = pd.to_datetime(ts, errors="coerce", utc=True)
 
     now = pd.Timestamp.utcnow()
-    # Start of the current week (Monday)
     start_of_week = now - pd.Timedelta(days=now.weekday())
 
-    weekly = [r for r in rows if r.get("timestamp") is not pd.NaT and r["timestamp"] >= start_of_week]
-    weekly.sort(key=lambda x: x.get("score", 0), reverse=True)
+    weekly = [
+        r for r in rows
+        if pd.notna(r["timestamp"]) and r["timestamp"] >= start_of_week
+    ]
+
+    # Optional filter by game
+    if game_id:
+        weekly = [r for r in weekly if r.get("game_id") == game_id]
+
+    weekly.sort(key=lambda x: float(x.get("score", 0)), reverse=True)
+
     return weekly[:limit]
 
 # ---------------------------
 # Get all-time leaderboard
 # ---------------------------
-def get_alltime_leaderboard(limit=10):
+def get_alltime_leaderboard(limit=10, game_id=None):
     """
     Returns top scores of all time
+    Optional: filter by game_id
     """
+
     mode = st.session_state.get("mode_selection", "Offline")
     rows = []
 
+    # ---------------- ONLINE MODE ----------------
     if mode == "Online":
         ok, _ = init_firebase_if_needed()
+
         if ok:
-            rows = fb_get("/leaderboard") or []
+            fb_rows = fb_get("/leaderboard") or []
+            if isinstance(fb_rows, dict):
+                fb_rows = list(fb_rows.values())
+            rows.extend(fb_rows)
+
+        # Optional online CSV
+        try:
+            online_df = pd.read_csv("leaderboard_online.csv")
+            rows.extend(online_df.to_dict("records"))
+        except:
+            pass
+
+    # ---------------- OFFLINE MODE ----------------
     else:
         try:
             rows = pd.read_csv(LEADERBOARD_FILE).to_dict("records")
         except FileNotFoundError:
             rows = []
 
-    rows.sort(key=lambda x: x.get("score", 0), reverse=True)
+    if not rows:
+        return []
+
+    # Optional filter
+    if game_id:
+        rows = [r for r in rows if r.get("game_id") == game_id]
+
+    rows.sort(key=lambda x: float(x.get("score", 0)), reverse=True)
+
     return rows[:limit]
 
 
+
+
 # ----------------- Session & Presence helpers -----------------
 def now_iso():
     return datetime.utcnow().isoformat()
@@ -1105,6 +1150,13 @@ def home_page():
 
         unified_set(f"games/{active_game_id}", game)
 
+    st.subheader("🏆 All-Time Global Top 10")
+    alltime = get_alltime_leaderboard()
+    
+    for i, r in enumerate(alltime, 1):
+        st.write(f"{i}. {r.get('avatar','🎮')} **{r['name']}** — {r['score']} pts")
+
+
 
 def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic=None):
     games = unified_get("games") or {}