6e77de4c1e
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 9s
CI / integration (pull_request) Successful in 13s
CI / ui (pull_request) Successful in 53s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m26s
Three owner-requested polish changes: - robot: replace the lengthening 60-90 min -> 6 h proactive-nudge ramp with a flat uniform 9-12 h wait before every nudge; the existing sleep-window gate still skips and defers a nudge that would land in the robot's night. - ui: colour the lobby/in-game unread dot by type -- the regular danger colour when a chat message is unread, a softer amber (--warn) when only nudges are. Adds a per-viewer unread_messages flag (chat_messages.kind='message') across the backend DTO, FlatBuffers wire, gateway transcode and the UI store. - ui: float games with any unread notification to the top of the lobby's your-turn and opponent-turn sections (finished keeps its order), reusing the existing unread_chat flag. Docs (ARCHITECTURE 7, FUNCTIONAL + _ru) updated. No DB migration; the new wire field is backward-compatible.
135 lines
4.7 KiB
TypeScript
135 lines
4.7 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import { gamePhase, groupGames, isMyTurn, shouldBlink } from './lobbysort';
|
|
import type { GameView, Seat } from './model';
|
|
|
|
const ME = 'me';
|
|
const seat = (s: number, accountId: string): Seat => ({
|
|
seat: s,
|
|
accountId,
|
|
displayName: accountId,
|
|
score: 0,
|
|
hintsUsed: 0,
|
|
isWinner: false,
|
|
});
|
|
|
|
function game(id: string, status: GameView['status'], toMove: number, lastActivityUnix: number): GameView {
|
|
return {
|
|
id,
|
|
variant: 'scrabble_en',
|
|
dictVersion: 'v1',
|
|
vsAi: false,
|
|
unreadChat: false,
|
|
unreadMessages: false,
|
|
status,
|
|
players: 2,
|
|
toMove,
|
|
turnTimeoutSecs: 0,
|
|
multipleWordsPerTurn: true,
|
|
moveCount: 0,
|
|
endReason: '',
|
|
lastActivityUnix,
|
|
seats: [seat(0, ME), seat(1, 'opp')],
|
|
};
|
|
}
|
|
|
|
describe('groupGames', () => {
|
|
it('partitions into your-turn, their-turn and finished', () => {
|
|
const g = groupGames(
|
|
[
|
|
game('a', 'active', 0, 100), // toMove 0 == my seat -> my turn
|
|
game('b', 'active', 1, 100), // their turn
|
|
game('c', 'finished', 0, 100),
|
|
],
|
|
ME,
|
|
{},
|
|
);
|
|
expect(g.yourTurn.map((x) => x.id)).toEqual(['a']);
|
|
expect(g.theirTurn.map((x) => x.id)).toEqual(['b']);
|
|
expect(g.finished.map((x) => x.id)).toEqual(['c']);
|
|
});
|
|
|
|
it('orders your-turn oldest-first, the other two newest-first', () => {
|
|
const g = groupGames(
|
|
[
|
|
game('y_new', 'active', 0, 200),
|
|
game('y_old', 'active', 0, 100),
|
|
game('t_new', 'active', 1, 200),
|
|
game('t_old', 'active', 1, 100),
|
|
game('f_new', 'finished', 0, 200),
|
|
game('f_old', 'finished', 0, 100),
|
|
],
|
|
ME,
|
|
{},
|
|
);
|
|
expect(g.yourTurn.map((x) => x.id)).toEqual(['y_old', 'y_new']);
|
|
expect(g.theirTurn.map((x) => x.id)).toEqual(['t_new', 't_old']);
|
|
expect(g.finished.map((x) => x.id)).toEqual(['f_new', 'f_old']);
|
|
});
|
|
|
|
it('bumps unread games first in the active sections, leaving finished by activity', () => {
|
|
const g = groupGames(
|
|
[
|
|
game('y_read', 'active', 0, 50), // my turn, oldest, read
|
|
game('y_unread', 'active', 0, 200), // my turn, newest, unread -> bumped above y_read
|
|
game('t_read', 'active', 1, 200), // their turn, newest, read
|
|
game('t_unread', 'active', 1, 50), // their turn, oldest, unread -> bumped above t_read
|
|
game('f_unread', 'finished', 0, 100),
|
|
game('f_new', 'finished', 0, 300), // finished ignores unread, stays newest-first
|
|
],
|
|
ME,
|
|
{ y_unread: true, t_unread: true, f_unread: true },
|
|
);
|
|
// Unread is the primary key, so it overrides the within-section activity order.
|
|
expect(g.yourTurn.map((x) => x.id)).toEqual(['y_unread', 'y_read']);
|
|
expect(g.theirTurn.map((x) => x.id)).toEqual(['t_unread', 't_read']);
|
|
// Finished ignores unread: still newest-first by activity.
|
|
expect(g.finished.map((x) => x.id)).toEqual(['f_new', 'f_unread']);
|
|
});
|
|
|
|
it('isMyTurn is false for a finished game even at my seat', () => {
|
|
expect(isMyTurn(game('x', 'finished', 0, 0), ME)).toBe(false);
|
|
expect(isMyTurn(game('x', 'active', 0, 0), ME)).toBe(true);
|
|
expect(isMyTurn(game('x', 'active', 1, 0), ME)).toBe(false);
|
|
});
|
|
|
|
it('treats an open game (awaiting an opponent) as in progress, not finished', () => {
|
|
const g = groupGames(
|
|
[
|
|
game('open_mine', 'open', 0, 100), // my turn while waiting
|
|
game('open_wait', 'open', 1, 100), // the empty seat's turn
|
|
],
|
|
ME,
|
|
{},
|
|
);
|
|
expect(g.yourTurn.map((x) => x.id)).toEqual(['open_mine']);
|
|
expect(g.theirTurn.map((x) => x.id)).toEqual(['open_wait']);
|
|
expect(g.finished).toEqual([]);
|
|
expect(isMyTurn(game('x', 'open', 0, 0), ME)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('gamePhase', () => {
|
|
it('maps each game to its lobby bucket (open folds into mine/theirs like active)', () => {
|
|
expect(gamePhase(game('x', 'active', 0, 0), ME)).toBe('mine');
|
|
expect(gamePhase(game('x', 'active', 1, 0), ME)).toBe('theirs');
|
|
expect(gamePhase(game('x', 'open', 0, 0), ME)).toBe('mine');
|
|
expect(gamePhase(game('x', 'open', 1, 0), ME)).toBe('theirs');
|
|
expect(gamePhase(game('x', 'finished', 0, 0), ME)).toBe('finished');
|
|
});
|
|
});
|
|
|
|
describe('shouldBlink', () => {
|
|
it('blinks on a transition into mine or finished', () => {
|
|
expect(shouldBlink('theirs', 'mine')).toBe(true);
|
|
expect(shouldBlink('mine', 'finished')).toBe(true);
|
|
expect(shouldBlink('theirs', 'finished')).toBe(true);
|
|
});
|
|
|
|
it('stays quiet on a transition into theirs, a no-op, or a first sighting', () => {
|
|
expect(shouldBlink('mine', 'theirs')).toBe(false);
|
|
expect(shouldBlink('mine', 'mine')).toBe(false);
|
|
expect(shouldBlink(undefined, 'mine')).toBe(false);
|
|
expect(shouldBlink(undefined, 'finished')).toBe(false);
|
|
});
|
|
});
|