From 471578af779dcf4644179c5402f0e9e28cfbde0d Mon Sep 17 00:00:00 2001
From: Stan Runge <stan@stanrunge.dev>
Date: Sat, 7 Mar 2026 17:15:06 +0100
Subject: [PATCH] always sort scores on win condition

---
 src/lib/components/Sidebar.svelte             |  2 +-
 src/lib/server/match/engine.ts                |  3 ++-
 src/routes/(app)/matches/[id]/+page.server.ts | 12 ++++++++++++
 src/routes/(app)/matches/[id]/+page.svelte    |  7 +------
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte
index 596328d..eff6861 100644
--- a/src/lib/components/Sidebar.svelte
+++ b/src/lib/components/Sidebar.svelte
@@ -110,7 +110,7 @@
 			{ href: '/mappools', label: 'Mappools', icon: 'mappools' },
 			// { href: '/teams', label: 'Teams', icon: 'teams' },
 			{ href: '/leaderboard', label: 'Leaderboard', icon: 'leaderboard' },
-		] as item}
+		] as item (item.href)}
 			<a
 				href={item.href}
 				class="font-500 flex items-center gap-3 rounded-md px-3 py-2 text-sm transition-colors {isActive(item.href)
diff --git a/src/lib/server/match/engine.ts b/src/lib/server/match/engine.ts
index 43d9114..79796be 100644
--- a/src/lib/server/match/engine.ts
+++ b/src/lib/server/match/engine.ts
@@ -668,7 +668,8 @@ export async function getMatchFull(matchId: string) {
 				with: {
 					slot: true,
 					scores: {
-						with: { player: true }
+						with: { player: true },
+						orderBy: (s, { desc }) => [desc(s.score)]
 					}
 				},
 				orderBy: (g, { asc }) => [asc(g.gameNumber)]
diff --git a/src/routes/(app)/matches/[id]/+page.server.ts b/src/routes/(app)/matches/[id]/+page.server.ts
index 2162b86..df3a062 100644
--- a/src/routes/(app)/matches/[id]/+page.server.ts
+++ b/src/routes/(app)/matches/[id]/+page.server.ts
@@ -24,6 +24,18 @@ export const load: PageServerLoad = async ({ params, locals }) => {
 		error(404, 'Match not found');
 	}
 
+	// Sort game scores by the match win condition so clients always receive sorted data
+	const scoringType = (m.config as MatchConfig).scoringType;
+	for (const game of m.games) {
+		if (game.scores?.length > 1) {
+			game.scores.sort((a, b) => {
+				if (scoringType === 'accuracy') return b.accuracy - a.accuracy;
+				if (scoringType === 'combo') return b.maxCombo - a.maxCombo;
+				return b.score - a.score;
+			});
+		}
+	}
+
 	// Build beatmap metadata cache — prefer DB-stored R2 URLs, fall back to API
 	const beatmapCache: Record<string, any> = {};
 	if (m.mappool?.slots) {
diff --git a/src/routes/(app)/matches/[id]/+page.svelte b/src/routes/(app)/matches/[id]/+page.svelte
index 8846efe..5c76ee8 100644
--- a/src/routes/(app)/matches/[id]/+page.svelte
+++ b/src/routes/(app)/matches/[id]/+page.svelte
@@ -544,12 +544,7 @@
 					<!-- Per-player score breakdown -->
 					{#if game.state === 'FINISHED' && game.scores?.length > 0}
 						<div class="mt-1.5 flex flex-col gap-1">
-							{#each [...game.scores].sort((a: any, b: any) => {
-								if (config.scoringType === 'accuracy') return b.accuracy - a.accuracy;
-								if (config.scoringType === 'combo') return b.maxCombo - a.maxCombo;
-								if (config.scoringType === 'pp') return (b.pp ?? 0) - (a.pp ?? 0);
-								return b.score - a.score;
-							}) as s}
+							{#each game.scores as s}
 								{@const username = playerNames[s.player?.userId]}
 								<div class="flex flex-wrap items-center gap-x-3 gap-y-0.5 rounded bg-surface-900 px-3 py-1.5 text-xs">
 									<span class="w-24 truncate font-500">{username ?? s.player?.userId ?? '?'}</span>