games: Update ScrabbleDex to detect DQ-win games as wins

Author: PartMan7

src/database/games.ts

@@ -13,7 +13,7 @@ import type { Log as ScrabbleLog } from '@/ps/games/scrabble/logs';
 import type { WinCtx as ScrabbleWinCtx } from '@/ps/games/scrabble/types';
 import type { Player } from '@/ps/games/types';
 
-const schema = new mongoose.Schema({
+const schema = new mongoose.Schema<GameModel>({
 	id: {
 		type: String,
 		required: true,
@@ -44,6 +44,7 @@ const schema = new mongoose.Schema({
 				type: String,
 				required: true,
 			},
+			out: Boolean,
 		},
 		required: true,
 	},
@@ -117,6 +118,14 @@ export async function getScrabbleDex(): Promise<ScrabbleDexEntry[] | null> {
 			const winCtx = game.winCtx as ScrabbleWinCtx | undefined;
 			const winners = winCtx?.type === 'win' ? winCtx.winnerIds : [];
 			const logs = game.log.map<ScrabbleLog>(log => JSON.parse(log));
+			if (winCtx?.type === 'dq') {
+				const leftUsers = logs.filter(log => log.action === 'dq' || log.action === 'forfeit').map(log => log.turn);
+				winners.push(
+					...Object.values(game.players)
+						.map(player => player.turn)
+						.filter(player => !leftUsers.includes(player))
+				);
+			}
 			return logs
 				.filterMap<ScrabbleDexEntry[]>(log => {
 					if (log.action !== 'play') return;

src/ps/games/scrabble/logs.ts

@@ -1,30 +1,32 @@
 import type { DIRECTION } from '@/ps/games/scrabble/constants';
 import type { BoardTile, Points } from '@/ps/games/scrabble/types';
-import type { BaseLog } from '@/ps/games/types';
+import type { BaseLog, BaseLogAction } from '@/ps/games/types';
 import type { Satisfies, SerializedInstance } from '@/types/common';
 import type { Point } from '@/utils/grid';
 
-export type Log = Satisfies<
-	BaseLog,
-	{
-		time: Date;
-		turn: string;
-	} & (
-		| {
-				action: 'play';
-				ctx: {
-					points: Points;
-					tiles: BoardTile[];
-					dir: DIRECTION;
-					point: Point;
-					newTiles: string[];
-					rack: string[];
-					words: Record<string, number>;
-				};
-		  }
-		| { action: 'exchange'; ctx: { tiles: string[]; newTiles: string[]; rack: string[] } }
-		| { action: 'pass'; ctx: { rack: string[] } }
-	)
->;
+export type Log =
+	| Satisfies<
+			BaseLog,
+			{
+				time: Date;
+				turn: string;
+			} & (
+				| {
+						action: 'play';
+						ctx: {
+							points: Points;
+							tiles: BoardTile[];
+							dir: DIRECTION;
+							point: Point;
+							newTiles: string[];
+							rack: string[];
+							words: Record<string, number>;
+						};
+				  }
+				| { action: 'exchange'; ctx: { tiles: string[]; newTiles: string[]; rack: string[] } }
+				| { action: 'pass'; ctx: { rack: string[] } }
+			)
+	  >
+	| BaseLogAction;
 
 export type APILog = SerializedInstance<Log>;

src/ps/games/scrabble/types.ts

@@ -48,7 +48,7 @@ export type RenderCtx = {
 	turn: string;
 	selected?: Point | null;
 };
-export type WinCtx = { type: 'win'; winnerIds: string[]; score: State['score'] } | { type: 'draw' };
+export type WinCtx = { type: 'win'; winnerIds: string[]; score: State['score'] } | { type: 'draw' } | { type: 'dq' };
 
 export type Word = { word: string; baseScore: number; bonuses: BonusReducer[] };
 export type WordScore = [times: number, plus: number];

src/ps/games/types.ts

@@ -68,6 +68,7 @@ export type ActionResponse<T = null> = { success: true; data: T } | { success: f
 export type EndType = 'regular' | 'force' | 'dq' | 'loss';
 
 export type BaseLog = { action: string; time: Date; turn: string | null; ctx: unknown };
+export type BaseLogAction = { action: 'dq' | 'forfeit' | 'skip'; turn: string; ctx: null } & BaseLog;
 
 export type CommonLog<Turn extends string = string> = Satisfies<
 	BaseLog,

src/ps/loaders/index.ts

@@ -9,8 +9,10 @@ export default async function init() {
 	await connection;
 	await loadCommands();
 	if (IS_ENABLED.DB) {
-		await loadAlts();
-		await loadSeens();
+		if (process.env.NODE_ENV !== 'development') {
+			await loadAlts();
+			await loadSeens();
+		}
 		await loadRoomConfigs();
 	}
 }