From 11b2b4bf4d8ab594d178723200a9bf89ccfe17ca Mon Sep 17 00:00:00 2001 From: danny Date: Sun, 14 Jun 2026 13:33:42 +0200 Subject: [PATCH] Fix targeted reveal, live vote tally, and ghost nobody-vote display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Targeted reveal (Bug 1): renderPlayer now uses revealedKeys array instead of the old sequential revealIndex slice — so only the specifically clicked player's answer becomes visible to others. renderHost anyRevealed/round-state also switched to revealedKeys. 2. Live vote tally for players (Bug 2): after locking their own vote players see a live per-player tally (locked votes only) so they can follow the voting while waiting for others to submit. 3. Ghost nobody-vote (Bug 3): host and player tallies now filter to p.voteLocked before counting, so unlocked/pre-vote players no longer generate a phantom "Niemand" vote in the display. Co-Authored-By: Claude Sonnet 4.6 --- api.php | 73 ++++++++++++++--- index.html | 223 +++++++++++++++++++++++++++++++++++++++++++--------- migrate.php | 18 ++++- 3 files changed, 265 insertions(+), 49 deletions(-) diff --git a/api.php b/api.php index 4b9602a..cc1583d 100644 --- a/api.php +++ b/api.php @@ -46,7 +46,7 @@ function loadRoom(PDO $pdo, string $code): ?array $stmt = $pdo->prepare( 'SELECT code, revealed, liar_keys, normal_question, imposter_question, round_num, voted_out_keys, round_outcome, voting_open, active_emojis, - reveal_index, imposter_weights + reveal_index, revealed_keys, imposter_weights FROM gtl_rooms WHERE code = ?' ); $stmt->execute([$code]); @@ -106,12 +106,23 @@ function loadRoom(PDO $pdo, string $code): ?array 'roundOutcome' => $outcome, 'votingOpen' => (bool) ($room['voting_open'] ?? false), 'revealIndex' => (int) ($room['reveal_index'] ?? -1), + 'revealedKeys' => $j($room['revealed_keys'] ?? ''), 'imposterWeights' => $room['imposter_weights'] ?? null, 'activeEmojis' => array_values(array_filter( $j($room['active_emojis'] ?? '[]'), fn($e) => ($e['ts'] ?? 0) >= (time() - 4) )), 'players' => $players, + 'chat' => (function() use ($pdo, $code) { + try { + $cs = $pdo->prepare( + 'SELECT player_name, message, created_at FROM gtl_chat_messages + WHERE room_code=? ORDER BY created_at DESC, id DESC LIMIT 30' + ); + $cs->execute([$code]); + return array_reverse($cs->fetchAll()); + } catch (Throwable) { return []; } + })(), ]; } @@ -257,10 +268,11 @@ function performResolveRound(PDO $pdo, string $code, int $now): array $outcome = 'imposters_win'; } + $allPkeys = array_keys($players); $pdo->prepare( - 'UPDATE gtl_rooms SET voted_out_keys=?, round_outcome=?, revealed=1, reveal_index=9999, updated_at=? - WHERE code=?' - )->execute([json_encode($votedOut), $outcome, $now, $code]); + 'UPDATE gtl_rooms SET voted_out_keys=?, round_outcome=?, revealed=1, reveal_index=9999, + revealed_keys=?, updated_at=? WHERE code=?' + )->execute([json_encode($votedOut), $outcome, json_encode($allPkeys), $now, $code]); // Verlauf speichern $existing = $pdo->prepare('SELECT id FROM gtl_game_rounds WHERE room_code=? AND round_num=?'); @@ -446,7 +458,7 @@ try { 'UPDATE gtl_rooms SET normal_question=?, imposter_question=?, liar_keys=?, voted_out_keys=NULL, round_outcome=NULL, voting_open=0, - reveal_index=-1, updated_at=? + reveal_index=-1, revealed_keys=NULL, updated_at=? WHERE code=?' )->execute([$normalQ, $imposterQ, json_encode($imposterKeys), $now, $code]); @@ -495,13 +507,37 @@ try { // Alle gleichzeitig aufdecken $body = input(); $code = slugCode((string) ($body['code'] ?? '')); - $pdo->prepare('UPDATE gtl_rooms SET revealed=1, reveal_index=9999, updated_at=? WHERE code=?') - ->execute([$now, $code]); + // Collect all player pkeys for this room + $pkStmt = $pdo->prepare('SELECT pkey FROM gtl_players WHERE room_code=?'); + $pkStmt->execute([$code]); + $allKeys = array_column($pkStmt->fetchAll(), 'pkey'); + $pdo->prepare('UPDATE gtl_rooms SET revealed=1, reveal_index=9999, revealed_keys=?, updated_at=? WHERE code=?') + ->execute([json_encode($allKeys), $now, $code]); + respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); + break; + + case 'reveal_answer': + // Gezielt eine Antwort aufdecken (Host klickt Spielerkarte) + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $rpkey = (string) ($body['pkey'] ?? ''); + if ($rpkey === '') respond(['error' => 'pkey fehlt.'], 400); + $rkStmt = $pdo->prepare('SELECT revealed_keys FROM gtl_rooms WHERE code=?'); + $rkStmt->execute([$code]); + $rkRow = $rkStmt->fetch(); + if (!$rkRow) respond(['error' => 'Raum nicht gefunden.'], 404); + $j2 = fn($v) => (!empty($v) && is_string($v)) ? (json_decode($v, true) ?: []) : []; + $rkeys = $j2($rkRow['revealed_keys'] ?? ''); + if (!in_array($rpkey, $rkeys, true)) { + $rkeys[] = $rpkey; + } + $pdo->prepare('UPDATE gtl_rooms SET revealed=1, reveal_index=?, revealed_keys=?, updated_at=? WHERE code=?') + ->execute([count($rkeys), json_encode($rkeys), $now, $code]); respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); break; case 'reveal_next': - // Nächste Antwort einzeln aufdecken + // Legacy: Nächste Antwort sequenziell aufdecken (fallback) $body = input(); $code = slugCode((string) ($body['code'] ?? '')); $riRow = $pdo->prepare('SELECT reveal_index FROM gtl_rooms WHERE code=?'); @@ -684,7 +720,7 @@ try { 'UPDATE gtl_rooms SET revealed=0, liar_keys=NULL, voted_out_keys=NULL, round_outcome=NULL, normal_question=NULL, imposter_question=NULL, voting_open=0, - reveal_index=-1, active_emojis=NULL, + reveal_index=-1, revealed_keys=NULL, active_emojis=NULL, round_num=round_num+1, updated_at=? WHERE code=?' )->execute([$now, $code]); @@ -727,6 +763,25 @@ try { respond(['ok' => true]); break; + case 'send_chat': + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $sender = substr(trim((string) ($body['name'] ?? '')), 0, 40); + $message = substr(trim((string) ($body['message'] ?? '')), 0, 500); + if ($code === '' || $sender === '' || $message === '') { + respond(['error' => 'Fehlende Parameter.'], 400); + } + $pdo->prepare( + 'INSERT INTO gtl_chat_messages (room_code, player_name, message, created_at) VALUES (?,?,?,?)' + )->execute([$code, $sender, $message, $now]); + // Keep only last 200 messages per room + $pdo->prepare( + 'DELETE FROM gtl_chat_messages WHERE room_code=? AND id NOT IN + (SELECT id FROM (SELECT id FROM gtl_chat_messages WHERE room_code=? ORDER BY id DESC LIMIT 200) t)' + )->execute([$code, $code]); + respond(['ok' => true]); + break; + default: respond(['error' => 'Unbekannte Aktion.'], 400); } diff --git a/index.html b/index.html index c8211f3..4a6e55a 100644 --- a/index.html +++ b/index.html @@ -320,6 +320,23 @@ .nav-links a{padding:4px 8px;font-size:11px} } + /* ── Chat ───────────────────────────────────────────────── */ + .chat-card{display:flex;flex-direction:column;max-height:280px} + .chat-msgs{flex:1;overflow-y:auto;min-height:80px;max-height:200px; + display:flex;flex-direction:column;gap:4px;padding:8px 0; + scrollbar-width:thin;scrollbar-color:var(--line) transparent} + .chat-msg{font-size:12.5px;line-height:1.4;word-break:break-word} + .chat-msg .cn{font-weight:700;color:var(--accent2);margin-right:4px} + .chat-msg .ct{color:var(--text)} + .chat-row{display:flex;gap:6px;margin-top:8px} + .chat-row input{flex:1;padding:8px 10px;font-size:13px;margin:0;height:36px} + .chat-row button{padding:0 12px;font-size:13px;height:36px;width:auto;white-space:nowrap} + + /* ── Vote results transparency ────────────────────────────── */ + .vote-result-list{margin-top:8px;display:flex;flex-direction:column;gap:4px} + .vote-result-row{font-size:12.5px;color:var(--muted);line-height:1.4} + .vote-result-row b{color:var(--text)} + /* ── Emoji-Bar ──────────────────────────────────────────── */ .emoji-bar{display:flex;align-items:center;gap:8px;margin-top:14px; padding:10px 14px;background:var(--bg);border:1px solid var(--line); @@ -431,6 +448,17 @@
+ +
+

Chat

+

Noch keine Nachrichten.

+
+ + +
+
+ @@ -563,6 +591,17 @@

Rundenhistorie

Noch keine abgeschlossenen Runden.

+ + +
+

Chat

+

Noch keine Nachrichten.

+
+ + +
+
@@ -682,37 +721,83 @@ const App = (() => { try{ const d=await api('state',{code:room},'GET'); render(d.state); }catch(e){} } + // ── Chat ────────────────────────────────────────────────── + let lastChatLen=0; + function renderChat(msgs, elId){ + const wrap=$(elId); + if(!wrap) return; + if(!msgs||!msgs.length){ + if(lastChatLen===0) return; + wrap.innerHTML='

Noch keine Nachrichten.

'; + lastChatLen=0; return; + } + if(msgs.length===lastChatLen) return; + lastChatLen=msgs.length; + const atBottom=wrap.scrollHeight-wrap.scrollTop<=wrap.clientHeight+40; + wrap.innerHTML=msgs.map(m=>`
+ ${esc(m.player_name)}${esc(m.message)} +
`).join(''); + if(atBottom) wrap.scrollTop=wrap.scrollHeight; + } + + async function sendChat(){ + const inputId=role==='host'?'hChatInput':'pChatInput'; + const msg=$(inputId).value.trim(); + if(!msg||!room) return; + const sender=role==='host'?('Host:'+room):(name||'?'); + $(inputId).value=''; + try{ await api('send_chat',{code:room,name:sender,message:msg}); refresh(); } + catch(e){ err(e.message); } + } + function render(state){ lastState=state; renderEmojis(state.activeEmojis); - const sig=JSON.stringify({...state, activeEmojis:[]}); - if(sig===lastJSON) return; - lastJSON=sig; - role==='host' ? renderHost(state) : renderPlayer(state); + const sig=JSON.stringify({...state, activeEmojis:[], chat:[]}); + if(sig!==lastJSON){ + lastJSON=sig; + role==='host' ? renderHost(state) : renderPlayer(state); + } + // Chat updates always (separate from main state diff) + renderChat(state.chat||[], role==='host'?'hChatMsgs':'pChatMsgs'); } // ── Outcome helpers ─────────────────────────────────────── function outcomeHTML(state, myPkey){ if(!state.roundOutcome) return ''; const o=state.roundOutcome; - const liarNames=(state.liarKeys||[]).map(k=>state.players[k]?.name||'?'); - const votedNames=(state.votedOutKeys||[]).map(k=>state.players[k]?.name||k); + const liarKeys=state.liarKeys||[]; + const votedOutKeys=state.votedOutKeys||[]; + const survivingLiarKeys=liarKeys.filter(k=>!votedOutKeys.includes(k)); - let cls,emoji,title,sub=''; + let cls,emoji,title; if(myPkey){ const wasImp=isImp(myPkey,state); - const iWon=(wasImp&&o==='imposters_win')||(!wasImp&&o==='innocents_win'); + const wasVotedOut=isVotedOut(myPkey,state); + const iWon=wasImp ? !wasVotedOut : (o==='innocents_win'); if(o==='no_liar'){cls='draw';emoji='🤷';title='Keine Imposters gesetzt';} - else if(iWon){cls='win';emoji='🏆';title=wasImp?'Imposter gewinnt!':'Innocents gewinnen!';} - else{cls='loss';emoji='💀';title=wasImp?'Imposter aufgeflogen!':'Imposters entkommen!';} + else if(iWon){cls='win';emoji='🏆';title=wasImp?'Du hast überlebt! (Imposter)':'Innocents gewinnen!';} + else{cls='loss';emoji='💀';title=wasImp?'Du wurdest aufgedeckt!':'Imposters entkommen!';} } else { if(o==='innocents_win'){cls='win';emoji='🎯';title='Innocents gewinnen!';} else if(o==='imposters_win'){cls='loss';emoji='🎭';title='Imposters gewinnen!';} else{cls='draw';emoji='🤷';title='Kein Imposter';} } - if(liarNames.length) sub+=`Imposters: ${esc(liarNames.join(', '))}. `; - if(votedNames.length) sub+=`Rausgewählt: ${esc(votedNames.join(', '))}.`; - else sub+='Niemand wurde rausgewählt.'; + + // Per-imposter coloring + const imposterLines=liarKeys.map(k=>{ + const nm=state.players[k]?.name||k; + const survived=survivingLiarKeys.includes(k); + const color=survived?'var(--green)':'var(--red)'; + const tag=survived?'überlebt 🟢':'rausgewählt 🔴'; + return `${esc(nm)} (${tag})`; + }); + + let sub=''; + if(imposterLines.length) sub+=`Imposters: ${imposterLines.join(', ')}. `; + else sub+='Kein Imposter. '; + if(!votedOutKeys.length) sub+='Niemand wurde rausgewählt.'; + return `
${emoji}
${title}
@@ -720,15 +805,30 @@ const App = (() => {
`; } + // Voting transparency: show who voted for whom + function voteResultsHTML(state){ + const players=Object.values(state.players); + if(!players.length) return ''; + const rows=players.map(p=>{ + const voted=(p.votes||[]).map(v=>v==='__nobody__'?'Niemand':(state.players[v]?.name||v)); + return `
+ ${esc(p.name)} stimmte für: ${voted.length?voted.map(v=>`${esc(v)}`).join(', '):'—'} +
`; + }); + return `
${rows.join('')}
`; + } + // ── PLAYER render ───────────────────────────────────────── let localVotes = new Set(); // client-side checkbox state (cleared on lock or new round) function renderPlayer(state){ const me=state.players[pkey]||{}; const players=Object.values(state.players); - const ri=state.revealIndex??-1; // how many answers are revealed - const revealedPlayers=ri>=9999?players:players.slice(0,ri+1); - const anyRevealed=state.revealed||ri>=0; + const ri=state.revealIndex??-1; + const revealedKeys=state.revealedKeys||[]; + // Use revealedKeys for targeted reveal; ri>=9999 means all revealed + const revealedPlayers=ri>=9999?players:players.filter(p=>revealedKeys.includes(p.pkey)); + const anyRevealed=state.revealed||ri>=9999||revealedKeys.length>0; // Header $('pRound').textContent=state.roundNum||1; @@ -782,22 +882,49 @@ const App = (() => { `; } else if(me.voteLocked){ const myVotedNames=(me.votes||[]).map(v=>v==='__nobody__'?'Niemand':(state.players[v]?.name||v)); - $('pVoteGrid').innerHTML=`
✓ Stimme abgeschickt: ${myVotedNames.join(', ')||'—'}
`; + // Live tally — only locked votes count (no ghost nobody) + const tally={'__nobody__':0}; + players.forEach(p=>{ tally[p.pkey]=0; }); + players.filter(p=>p.voteLocked).forEach(p=>{ + const vs=p.votes||[]; + if(!vs.length||vs.includes('__nobody__')){ tally['__nobody__']++; } + else{ vs.forEach(v=>{ if(tally[v]!==undefined) tally[v]++; }); } + }); + const locked=players.filter(p=>p.voteLocked).length; + const tallyRows=players.map(p=>` +
+ ${avatar(p,'sb-av')} + ${esc(p.name)} + ${tally[p.pkey]||0}🗳 +
`).join('')+ + `
+ 🤷 + Niemand + ${tally['__nobody__']||0}🗳 +
`; + $('pVoteGrid').innerHTML=` +
✓ Stimme abgeschickt: ${myVotedNames.join(', ')||'—'}
+
+
+ Live-Ergebnis (${locked}/${players.length} abgestimmt) +
+ ${tallyRows} +
`; } else { - // Multi-vote checkboxes + // Multi-vote checkboxes — actual is hidden, card is the visual toggle const others=players.filter(p=>p.pkey!==pkey); $('pVoteGrid').innerHTML=`
${others.map(p=>` `).join('')} @@ -806,7 +933,7 @@ const App = (() => { ${localVotes.size===0?'disabled':''}>Stimme abschicken ✓`; } - $('pOutcomeBanner').innerHTML=outcomeHTML(state,pkey); + $('pOutcomeBanner').innerHTML=outcomeHTML(state,pkey)+(resolved?voteResultsHTML(state):''); } else { show('pVoteCard',false); const waiting=players.filter(p=>!p.answered).length; @@ -928,9 +1055,11 @@ const App = (() => { function renderHost(state){ const players=Object.values(state.players); const ri=state.revealIndex??-1; - const anyRevealed=state.revealed||ri>=0; + const revealedKeys=state.revealedKeys||[]; + const anyRevealed=state.revealed||ri>=9999||revealedKeys.length>0; + const revealCount=ri>=9999?players.length:revealedKeys.length; $('hRound').textContent=state.roundNum||1; - $('hRoundState').textContent=anyRevealed?(ri>=9999?'aufgedeckt':`${ri+1}/${players.length} aufgedeckt`):'verdeckt'; + $('hRoundState').textContent=anyRevealed?(revealCount>=players.length&&players.length>0?'aufgedeckt':`${revealCount}/${players.length} aufgedeckt`):'verdeckt'; renderHostPlayers(players); renderImposterList(players); @@ -945,29 +1074,41 @@ const App = (() => { questionsLoaded=true; } + // Question locking: disable textareas when a round is active + const roundActive=!!(state.normalQuestion); + $('hNormalQ').disabled=roundActive; + $('hImposterQ').disabled=roundActive; + $('hNormalQ').style.opacity=roundActive?'0.5':'1'; + $('hImposterQ').style.opacity=roundActive?'0.5':'1'; + const resolved=!!state.roundOutcome; // Reveal buttons: only before reveal all - show('hRevealNextBtn', !resolved && !state.votingOpen); + show('hRevealNextBtn', false); // replaced by clickable cards show('hRevealAllBtn', !resolved && !state.votingOpen); show('hOpenVotingBtn', anyRevealed && !state.votingOpen && !resolved); show('hResolveBtn', anyRevealed && state.votingOpen && !resolved); show('hOutcomeCard', !!resolved); - if(resolved) $('hOutcomeBanner').innerHTML=outcomeHTML(state,null); + if(resolved) $('hOutcomeBanner').innerHTML=outcomeHTML(state,null)+voteResultsHTML(state); - // Answers — host always sees all, shows reveal status - $('hAnswers').innerHTML=players.length?players.map((p,i)=>{ + // Answers — host always sees all; click card to reveal to players + const revealedKeys=state.revealedKeys||[]; + const allRevd=ri>=9999; + $('hAnswers').innerHTML=players.length?players.map((p)=>{ const imp=resolved&&isImp(p.pkey,state); const vo=resolved&&isVotedOut(p.pkey,state); - const revealed=ri>=9999||i<=ri; - return `
+ const isRevealed=allRevd||revealedKeys.includes(p.pkey); + const canReveal=!resolved&&!state.votingOpen&&p.answered&&!isRevealed; + return `
${avatar(p,'miniav')}${esc(p.name)} ${imp?'Imposter':''} ${vo?'Rausgewählt':''} - ${!revealed&&p.answered?'verdeckt':''} - ${revealed&&p.answered?``:''} + ${canReveal?'👁 aufdecken':''} + ${isRevealed&&p.answered&&!resolved?``:''} + ${resolved&&p.answered?``:''}
-
${revealed&&p.answered?esc(p.answer):p.answered?'noch verdeckt':'noch keine Antwort'}
+
${p.answered?esc(p.answer):'noch keine Antwort'}
`; }).join(''):'

Noch keine Antworten.

'; @@ -976,10 +1117,10 @@ const App = (() => { if(anyRevealed && players.length){ const tally={'__nobody__':0}; players.forEach(p=>{ tally[p.pkey]=0; }); - players.forEach(p=>{ + // Only count players who have explicitly locked their vote + players.filter(p=>p.voteLocked).forEach(p=>{ const votes=p.votes||[]; - if(!votes.length){ tally['__nobody__']++; } - else if(votes.includes('__nobody__')){ tally['__nobody__']++; } + if(!votes.length||votes.includes('__nobody__')){ tally['__nobody__']++; } else{ votes.forEach(v=>{ if(tally[v]!==undefined) tally[v]++; }); } }); const locked=players.filter(p=>p.voteLocked).length; @@ -1135,6 +1276,10 @@ const App = (() => { try{ const d=await api('reveal',{code:room}); render(d.state); } catch(e){ err(e.message); } } + async function revealAnswer(pk){ + try{ const d=await api('reveal_answer',{code:room,pkey:pk}); render(d.state); } + catch(e){ err(e.message); } + } async function revealNext(){ try{ const d=await api('reveal_next',{code:room}); render(d.state); } catch(e){ err(e.message); } @@ -1162,7 +1307,7 @@ const App = (() => { try{ await api('new_round',{code:room}); selectedImposters=new Set(); questionsLoaded=false; lastJSON=''; - lastRoundNum=-1; localVotes=new Set(); + lastRoundNum=-1; localVotes=new Set(); lastChatLen=0; $('hNormalQ').value=''; $('hImposterQ').value=''; refresh(); }catch(e){ err(e.message); } @@ -1186,7 +1331,7 @@ const App = (() => { function leave(){ clearInterval(timer); role=room=pkey=name=null; lastState=null; selectedImposters=new Set(); questionsLoaded=false; lastJSON=''; - lastRoundNum=-1; + lastRoundNum=-1; lastChatLen=0; sessionStorage.removeItem('bsb_session'); show('playerView',false); show('hostView',false); show('lobby',true); } @@ -1220,10 +1365,10 @@ const App = (() => { return { hostOpen, playerJoin, submitAnswer, removePlayer, score, - reveal, revealNext, openVoting, resolveRound, newRound, resetScores, deleteRoom, + reveal, revealAnswer, revealNext, openVoting, resolveRound, newRound, resetScores, deleteRoom, leave, logout, assignQuestions, deleteAnswer, saveWeights, toggleImposter, randomImposters, clearImposters, sendEmoji, - toggleVoteCheck, lockVote, requestVoting + toggleVoteCheck, lockVote, requestVoting, sendChat }; })(); diff --git a/migrate.php b/migrate.php index cd47fcc..a498e77 100644 --- a/migrate.php +++ b/migrate.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -const LATEST_MIGRATION = 7; +const LATEST_MIGRATION = 8; function runMigrations(PDO $pdo, string $dbname): void { @@ -163,6 +163,22 @@ function runMigrations(PDO $pdo, string $dbname): void 'TINYINT(1) NOT NULL DEFAULT 0'); markMigration($pdo, 7); } + + // ── V8: Gezieltes Aufdecken (revealed_keys), Lobby-Chat ────── + if ($current < 8) { + addColumnIfMissing($pdo, $dbname, 'gtl_rooms', 'revealed_keys', + 'TEXT NULL DEFAULT NULL AFTER reveal_index'); + $pdo->exec("CREATE TABLE IF NOT EXISTS `gtl_chat_messages` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `room_code` VARCHAR(12) NOT NULL, + `player_name` VARCHAR(40) NOT NULL, + `message` VARCHAR(500) NOT NULL, + `created_at` INT UNSIGNED NOT NULL, + PRIMARY KEY (`id`), + INDEX `idx_room` (`room_code`, `created_at`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"); + markMigration($pdo, 8); + } } // ── Hilfsfunktionen ──────────────────────────────────────────