add admin actions + set player rating at signup

This commit is contained in:
2026-03-09 22:00:25 +01:00
parent dfae3a4744
commit fd2ae80562
7 changed files with 373 additions and 19 deletions

View File

@@ -6,9 +6,19 @@ import { env } from '$env/dynamic/private';
import { getRequestEvent } from '$app/server';
import { db } from '$lib/server/db';
import { genericOAuth } from 'better-auth/plugins';
import { team, teamMember } from './db/schema';
import { team, teamMember, playerRating } from './db/schema';
import { proxyImage } from './storage/r2';
// Stash the osu! profile between mapProfileToUser and user.create.after
// (both run in the same request, so this is safe)
let pendingOsuProfile: { rank: number | null } | null = null;
function eloFromRank(rank: number | null): { elo: number; osuRank: number | null } {
if (!rank || rank <= 0) return { elo: 1000, osuRank: null };
const rawElo = 3500 - Math.log10(rank) * 500;
return { elo: Math.round(Math.max(0, Math.min(3500, rawElo))), osuRank: rank };
}
export const auth = betterAuth({
baseURL: env.ORIGIN,
secret: env.BETTER_AUTH_SECRET,
@@ -33,6 +43,17 @@ export const auth = betterAuth({
userId: user.id,
role: 'owner'
});
const { elo, osuRank } = eloFromRank(pendingOsuProfile?.rank ?? null);
pendingOsuProfile = null;
await db.insert(playerRating).values({
userId: user.id,
elo,
initialElo: elo,
osuRankAtSeed: osuRank
});
console.log(`[Auth] Seeded ${user.name} with ${elo} ELO (rank #${osuRank ?? 'unknown'})`);
}
}
}
@@ -81,6 +102,7 @@ export const auth = betterAuth({
};
},
async mapProfileToUser(profile) {
pendingOsuProfile = { rank: profile.statistics?.global_rank ?? null };
return {
name: profile.username,
image: await proxyImage(profile.avatar_url),

View File

@@ -18,7 +18,7 @@ import { getUser } from '$lib/server/osu/api';
// ── Initial Rating ──────────────────────────────────────────────────────
async function calculateInitialElo(userId: string): Promise<{ elo: number; osuRank: number | null }> {
export async function calculateInitialElo(userId: string): Promise<{ elo: number; osuRank: number | null }> {
const osuAccount = await db.query.account.findFirst({
where: and(eq(account.userId, userId), eq(account.providerId, 'osu'))
});
@@ -65,17 +65,11 @@ export async function joinQueue(userId: string, teamId: string) {
const activeMatchId = await findRecentActiveMatch(userId);
if (activeMatchId) throw new Error('You are already in an active match');
let rating = await db.query.playerRating.findFirst({
const rating = await db.query.playerRating.findFirst({
where: eq(playerRating.userId, userId)
});
if (!rating) {
const { elo: initialElo, osuRank } = await calculateInitialElo(userId);
[rating] = await db
.insert(playerRating)
.values({ userId, elo: initialElo, initialElo, osuRankAtSeed: osuRank })
.returning();
}
if (!rating) throw new Error('No rating found — please re-register');
const existing = await db.query.matchQueue.findFirst({
where: eq(matchQueue.userId, userId)
@@ -581,16 +575,13 @@ async function updateElo(participants: { id: string; teamId: string }[], winnerI
const playersWithRatings = [];
for (const player of players) {
let rating = await db.query.playerRating.findFirst({
const rating = await db.query.playerRating.findFirst({
where: eq(playerRating.userId, player.userId)
});
if (!rating) {
const { elo: initialElo, osuRank } = await calculateInitialElo(player.userId);
[rating] = await db
.insert(playerRating)
.values({ userId: player.userId, elo: initialElo, initialElo, osuRankAtSeed: osuRank })
.returning();
console.warn(`[ELO] No rating for user ${player.userId}, skipping`);
continue;
}
playersWithRatings.push({ userId: player.userId, rating });

View File

@@ -1,8 +1,18 @@
// src/routes/(app)/admin/+page.server.ts
import { db } from '$lib/server/db';
import { user } from '$lib/server/db/auth.schema';
import { playerRating } from '$lib/server/db/schema';
import { eq, desc } from 'drizzle-orm';
import {
playerRating,
match,
matchQueue,
matchInvite,
notification,
matchGame,
matchGameScore,
matchParticipant,
matchParticipantPlayer
} from '$lib/server/db/schema';
import { eq, desc, inArray, sql } from 'drizzle-orm';
import { requireRole, setUserRole, isRootAdmin } from '$lib/server/permissions';
import type { PageServerLoad, Actions } from './$types';
@@ -33,9 +43,26 @@ export const load: PageServerLoad = async ({ locals }) => {
})
);
const [activeMatches, queueSize, pendingInvites] = await Promise.all([
db
.select({ count: sql<number>`count(*)` })
.from(match)
.where(inArray(match.state, ['CREATED', 'LOBBY', 'ROLLING', 'PICKING', 'PLAYING'])),
db.select({ count: sql<number>`count(*)` }).from(matchQueue),
db
.select({ count: sql<number>`count(*)` })
.from(matchInvite)
.where(eq(matchInvite.status, 'pending'))
]);
return {
users: usersWithRatings,
actorIsRootAdmin: isRootAdmin(locals.user!.email)
actorIsRootAdmin: isRootAdmin(locals.user!.email),
stats: {
activeMatches: Number(activeMatches[0].count),
queueSize: Number(queueSize[0].count),
pendingInvites: Number(pendingInvites[0].count)
}
};
};
@@ -60,5 +87,66 @@ export const actions: Actions = {
}
return { success: true };
},
cancelAllMatches: async ({ locals }) => {
requireRole(locals, 'admin');
const cancelled = await db
.update(match)
.set({ state: 'CANCELLED', finishedAt: new Date() })
.where(inArray(match.state, ['CREATED', 'LOBBY', 'ROLLING', 'PICKING', 'PLAYING']))
.returning({ id: match.id });
await db.delete(matchQueue);
return { success: true, message: `Cancelled ${cancelled.length} match${cancelled.length !== 1 ? 'es' : ''} and cleared queue` };
},
clearQueue: async ({ locals }) => {
requireRole(locals, 'admin');
const deleted = await db.delete(matchQueue).returning({ id: matchQueue.id });
return { success: true, message: `Removed ${deleted.length} queue entr${deleted.length !== 1 ? 'ies' : 'y'}` };
},
expireInvites: async ({ locals }) => {
requireRole(locals, 'admin');
const expired = await db
.update(matchInvite)
.set({ status: 'expired' })
.where(eq(matchInvite.status, 'pending'))
.returning({ id: matchInvite.id });
return { success: true, message: `Expired ${expired.length} pending invite${expired.length !== 1 ? 's' : ''}` };
},
clearNotifications: async ({ locals }) => {
requireRole(locals, 'admin');
const deleted = await db.delete(notification).returning({ id: notification.id });
return { success: true, message: `Cleared ${deleted.length} notification${deleted.length !== 1 ? 's' : ''}` };
},
resetRatings: async ({ locals }) => {
requireRole(locals, 'admin');
const reset = await db
.update(playerRating)
.set({ elo: sql`COALESCE(initial_elo, 1000)`, wins: 0, losses: 0, updatedAt: new Date() })
.returning({ id: playerRating.id });
return { success: true, message: `Reset ${reset.length} rating${reset.length !== 1 ? 's' : ''} to initial ELO` };
},
clearMatchHistory: async ({ locals }) => {
requireRole(locals, 'admin');
await db.delete(matchGameScore);
await db.delete(matchGame);
await db.delete(matchParticipantPlayer);
await db.delete(matchParticipant);
await db.update(match).set({ winnerId: null });
await db.delete(match);
await db.delete(matchQueue);
await db.delete(matchInvite);
await db.delete(notification);
return { success: true, message: 'Cleared all match data, invites, and notifications' };
}
};

View File

@@ -4,6 +4,7 @@
let { data } = $props();
let actionError = $state('');
let actionSuccess = $state('');
const roleBadge: Record<string, { label: string; color: string }> = {
player: { label: 'Player', color: 'bg-surface-600 text-text-secondary border-border' },
@@ -36,6 +37,9 @@
{#if actionError}
<p class="mt-3 text-sm text-red-400">{actionError}</p>
{/if}
{#if actionSuccess}
<p class="mt-3 text-sm text-green-400">{actionSuccess}</p>
{/if}
<!-- Users Table -->
<div class="mt-6 rounded-lg border border-border bg-surface-800">
@@ -126,6 +130,53 @@
{/each}
</div>
<!-- Admin Tools -->
<div class="mt-6 rounded-lg border border-border bg-surface-800 p-5">
<h2 class="text-sm font-600">Tools</h2>
<!-- Stats -->
<div class="mt-3 flex gap-4 text-xs text-text-secondary">
<span>{data.stats.activeMatches} active match{data.stats.activeMatches !== 1 ? 'es' : ''}</span>
<span>{data.stats.queueSize} in queue</span>
<span>{data.stats.pendingInvites} pending invite{data.stats.pendingInvites !== 1 ? 's' : ''}</span>
</div>
<!-- Actions -->
<div class="mt-4 flex flex-wrap gap-2">
{#each [
{ action: 'cancelAllMatches', label: 'Cancel All Matches', confirm: 'Cancel all active matches and clear the queue?', color: 'border-yellow-500/30 text-yellow-400 hover:bg-yellow-500/10' },
{ action: 'clearQueue', label: 'Clear Queue', confirm: 'Remove everyone from the queue?', color: 'border-border text-text-secondary hover:bg-surface-700' },
{ action: 'expireInvites', label: 'Expire All Invites', confirm: 'Expire all pending invites?', color: 'border-border text-text-secondary hover:bg-surface-700' },
{ action: 'clearNotifications', label: 'Clear Notifications', confirm: 'Delete all notifications?', color: 'border-border text-text-secondary hover:bg-surface-700' },
{ action: 'resetRatings', label: 'Reset Ratings', confirm: 'Reset all ELO ratings to initial values? This cannot be undone.', color: 'border-red-500/30 text-red-400 hover:bg-red-500/10' },
{ action: 'clearMatchHistory', label: 'Clear All Match Data', confirm: 'Delete ALL matches, scores, invites, and notifications? This cannot be undone.', color: 'border-red-500/30 text-red-400 hover:bg-red-500/10' },
] as tool}
<form
method="post"
action="?/{tool.action}"
use:enhance={() => {
actionError = '';
actionSuccess = '';
return async ({ result, update }) => {
if (result.type === 'success' && (result.data as any)?.message) {
actionSuccess = (result.data as any).message;
await update();
} else if (result.type === 'success' && (result.data as any)?.error) {
actionError = (result.data as any).error;
}
};
}}
>
<button
type="submit"
onclick={(e) => { if (!confirm(tool.confirm)) e.preventDefault(); }}
class="rounded-md border px-3 py-1.5 text-xs font-500 transition-colors {tool.color}"
>{tool.label}</button>
</form>
{/each}
</div>
</div>
<!-- Permission Info -->
<div class="mt-6 rounded-lg border border-border bg-surface-800 p-5">
<h2 class="text-sm font-600">Permission Levels</h2>