Update app.py (#62)

- Update app.py (d6e70d0144e92142915da572a687ea25847a012b)

app.py

@@ -550,35 +550,28 @@ def create_game_page():
             # Here you can call your AI question generator function if you have one
 
 
-def join_game_page():
-    st.header("Join Game")
-
-    game_id = st.text_input("Enter Game ID")
-    username = st.text_input("Your Name")
-    avatar = st.selectbox("Choose Avatar", ["🎮","🤖","🧩","🛡️"])
-
-    if st.button("Join Game"):
-        if not game_id or not username:
-            st.warning("Enter both Game ID and Username")
-            return
-
-        ok, msg = join_game(game_id, username, avatar)
-        if ok:
-            st.success(f"Joined game {game_id} successfully!")
-
-            # Safe way to get questions
-            games = unified_get("games") or {}
-            g = games.get(game_id, {})
-
-            # Ensure 'questions' key exists
-            st.session_state['game_questions'] = g.get('questions', [])
-
-            st.session_state['game_id'] = game_id
-            st.session_state['username'] = username
-            st.session_state['avatar'] = avatar
-        else:
-            st.error(msg)
-
+# 1️⃣ Define join_game first
+def join_game(game_id, username, avatar):
+    games = unified_get("games") or {}
+    if game_id not in games:
+        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 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
@@ -778,28 +771,33 @@ def create_game(topics=None, num_questions=5, auto_close=True, ai_topic=None):
 # Join game
 def join_game_page():
     st.header("Join Game")
-    gid = st.text_input("Game ID", value=st.session_state.get('game_id',''))
-    uname = st.text_input("Your name", value=st.session_state.get('username',''))
-    avatar = st.selectbox("Avatar", ["🎮","🐱","🐶","🦄","👽","🎩"], index=0)
-    if st.button("Join"):
-        if not gid or not uname:
-            st.error("Provide Game ID and name.")
+
+    game_id = st.text_input("Enter Game ID")
+    username = st.text_input("Your Name")
+    avatar = st.selectbox("Choose Avatar", ["🎮","🤖","🧩","🛡️"])
+
+    if st.button("Join Game"):
+        if not game_id or not username:
+            st.warning("Enter both Game ID and Username")
+            return
+
+        ok, msg = join_game(game_id, username, avatar)
+        if ok:
+            st.success(f"Joined game {game_id} successfully!")
+
+            # Safe way to get questions
+            games = unified_get("games") or {}
+            g = games.get(game_id, {})
+
+            # Ensure 'questions' key exists
+            st.session_state['game_questions'] = g.get('questions', [])
+
+            st.session_state['game_id'] = game_id
+            st.session_state['username'] = username
+            st.session_state['avatar'] = avatar
         else:
-            ok, msg = join_game(gid, uname, avatar)
-            if not ok:
-                st.error(msg)
-            else:
-                st.success("Joined game.")
-                st.session_state['game_id'] = gid
-                st.session_state['username'] = uname
-                st.session_state['avatar'] = avatar
-                st.session_state['is_host'] = (unified_get("games") or {}).get(gid, {}).get("host") == uname
-                g = unified_get("games") or {}
-                st.session_state['game_questions'] = g[gid]['questions']
-                st.session_state['current_index'] = 0
-                st.session_state['answers'] = [""] * len(st.session_state['game_questions'])
-                st.session_state['answer_times'] = [None] * len(st.session_state['game_questions'])
-                st.rerun()
+            st.error(msg)
+
 
 # Play page
 # ----------------- Create Game -----------------