Ilia Denisov
a3cb917ec7
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 17s
CI / ui (pull_request) Successful in 45s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 58s
Review fixes for open-game auto-match: decodeMatchResult dropped the game when matched=false (an open game awaiting an opponent), so the client never navigated into it - decode the game whenever present. The lobby grouped open games (status != 'active') into 'finished'; treat 'open' as in progress in groupGames/isMyTurn and resultBadge. The under-board status bar now reads "Opponent's turn" while the empty opponent seat is to move (instead of the searching placeholder). The New Game rule toggle is shown from the start when a Russian variant is available, so selecting a variant no longer shifts the layout. Regression tests: codec (game decoded with matched=false), lobbysort + result (open is in progress), and the new-game e2e updated. UI-only; no backend or schema change.
41 lines
1.7 KiB
TypeScript
41 lines
1.7 KiB
TypeScript
// Pure grouping + ordering of the lobby's game list. The lobby shows three
|
|
// sections — games awaiting the caller's move, games awaiting the opponent, and finished
|
|
// games — each ordered by last activity: your-turn oldest-first (the longest-neglected on
|
|
// top), the other two newest-first.
|
|
|
|
import type { GameView } from './model';
|
|
|
|
/** isMyTurn reports whether an active game's seat-to-move belongs to the caller. */
|
|
export function isMyTurn(game: GameView, myId: string): boolean {
|
|
const me = game.seats.find((s) => s.accountId === myId);
|
|
// 'open' (an auto-match game still awaiting an opponent) is in progress like 'active'.
|
|
return (game.status === 'active' || game.status === 'open') && !!me && game.toMove === me.seat;
|
|
}
|
|
|
|
/** LobbyGroups holds the three ordered lobby sections. */
|
|
export interface LobbyGroups {
|
|
yourTurn: GameView[];
|
|
theirTurn: GameView[];
|
|
finished: GameView[];
|
|
}
|
|
|
|
/**
|
|
* groupGames partitions games for myId into the three lobby sections and orders each: the
|
|
* your-turn games by ascending last activity (the longest-waiting first), the opponent-turn
|
|
* and finished games by descending last activity (the most recent first).
|
|
*/
|
|
export function groupGames(games: GameView[], myId: string): LobbyGroups {
|
|
const yourTurn: GameView[] = [];
|
|
const theirTurn: GameView[] = [];
|
|
const finished: GameView[] = [];
|
|
for (const g of games) {
|
|
if (g.status !== 'active' && g.status !== 'open') finished.push(g);
|
|
else if (isMyTurn(g, myId)) yourTurn.push(g);
|
|
else theirTurn.push(g);
|
|
}
|
|
yourTurn.sort((a, b) => a.lastActivityUnix - b.lastActivityUnix);
|
|
theirTurn.sort((a, b) => b.lastActivityUnix - a.lastActivityUnix);
|
|
finished.sort((a, b) => b.lastActivityUnix - a.lastActivityUnix);
|
|
return { yourTurn, theirTurn, finished };
|
|
}
|