From e67c10ccfcfbc285e7c1fbda1a3ec5b9eeb65a19 Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 20 Mar 2022 15:42:16 -0500 Subject: switch from fallthrough to status: 404 --- src/routes/leaderboards/[name].svelte | 2 +- src/routes/player/[player]/index.svelte | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/routes/leaderboards/[name].svelte b/src/routes/leaderboards/[name].svelte index 1c20b2c..7596463 100644 --- a/src/routes/leaderboards/[name].svelte +++ b/src/routes/leaderboards/[name].svelte @@ -5,7 +5,7 @@ export const load: Load = async ({ params, fetch }) => { const data = await fetch(`${API_URL}leaderboards/${params.name}`).then(r => r.json()) - if (data.list.length === 0) return { fallthrough: true } as unknown + if (data.list.length === 0) return { status: 404, error: 'Unknown leaderboard' } return { props: { diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/index.svelte index b2f61c9..ac7292c 100644 --- a/src/routes/player/[player]/index.svelte +++ b/src/routes/player/[player]/index.svelte @@ -8,7 +8,10 @@ const data = await fetch(`${API_URL}player/${player}?customization=true`).then(r => r.json()) if (!data.player) { - return { fallthrough: true } as unknown + return { + status: 404, + error: 'Unknown player', + } } if (data.player.username !== player) { @@ -55,11 +58,14 @@ isActiveProfileOnline = Date.now() - 60 < activeProfileLastSave } - $: [data, updateActiveProfile()] + let backgroundUrl: string | null - $: backgroundUrl = - data.customization?.backgroundUrl ?? - (data.player ? chooseDefaultBackground(data.player.uuid) : null) + $: { + backgroundUrl = + data.customization?.backgroundUrl ?? + (data.player ? chooseDefaultBackground(data.player.uuid) : null) + updateActiveProfile() + } {#if backgroundUrl} -- cgit