Update app.py (#63)

- Update app.py (b96759c4cfe7435ca3e31810da6ca2ea4eb0fdfa)

app.py

@@ -557,22 +557,30 @@ def join_game(game_id, username, avatar):
         return False, "Invalid Game ID"
     if games[game_id].get("closed"):
         return False, "Game is closed"
+    
     players = unified_get("players") or {}
-    game_players = players.get(game_id, {})
+    if game_id not in players:
+        players[game_id] = {}
+
+    game_players = players[game_id]
+
     if username in game_players:
         game_players[username]['avatar'] = avatar
         game_players[username]['last_joined'] = now_iso()
     else:
         game_players[username] = {"avatar": avatar, "joined_at": now_iso(), "submitted": False}
+
     players[game_id] = game_players
     unified_set("players", players)
+
     ok, msg = claim_session_unified(game_id, username)
     if ok:
-        players = unified_get("players") or {}
         players[game_id][username]['last_heartbeat'] = now_iso()
         unified_set("players", players)
+
     return ok, msg
 
+
 def compute_score(questions, answers, times):
     total = 0
     flags = []
@@ -729,15 +737,9 @@ def home_page():
 
 # Create game
 def create_game(topics=None, num_questions=5, auto_close=True, ai_topic=None):
-    """
-    Creates a game, saves it, and returns a unique game ID.
-    """
     topics = topics or []
 
-    # Generate unique game ID
     gid = f"GAME{int(time.time())}{random.randint(100,999)}"
-
-    # Prepare game dict
     game_dict = {
         "game_id": gid,
         "host": st.session_state.get('username', 'Host'),
@@ -750,24 +752,32 @@ def create_game(topics=None, num_questions=5, auto_close=True, ai_topic=None):
         "closed": False
     }
 
-    # Optional: Add AI-generated questions
+    # Add AI-generated questions if provided
     if ai_topic:
         ai_questions = generate_ai_questions(ai_topic, n=num_questions)
-        game_dict["questions"].extend(ai_questions)
+        if ai_questions:
+            game_dict["questions"].extend(ai_questions)
+        else:
+            st.warning(f"No AI questions generated for topic '{ai_topic}'. Using static topics if any.")
+
+    # Add static questions if topics provided
+    for topic in topics:
+        qs = questions_db.get(topic, [])[:num_questions]
+        game_dict["questions"].extend(qs)
+
+    # Shuffle questions
+    random.shuffle(game_dict["questions"])
 
-    # Load current games
+    # Save
     games = unified_get("games") or {}
     games[gid] = game_dict
-
-    # Persist games
     unified_set("games", games)
-
-    # Also save in session_state for fast access
     st.session_state['games'] = games
 
     return gid
 
 
+
 # Join game
 def join_game_page():
     st.header("Join Game")