From 7518c06410f77986c89ebe838211910fa371f9a3 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Tue, 22 Aug 2023 17:17:51 -0700 Subject: [PATCH] fix: fix profile system --- package.json | 2 +- src/lib/auth.ts | 23 +++++++++++++++++--- src/lib/components/input/Button.svelte | 1 + src/lib/components/lemmy/SiteCard.svelte | 1 + src/lib/components/ui/Card.svelte | 2 +- src/lib/components/ui/Navbar.svelte | 2 +- src/lib/components/ui/sidebar/Sidebar.svelte | 5 +++++ src/routes/modlog/+page.svelte | 0 src/routes/modlog/+page.ts | 0 src/routes/profile/+layout.ts | 2 -- 10 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/routes/modlog/+page.svelte create mode 100644 src/routes/modlog/+page.ts diff --git a/package.json b/package.json index 5f25cc18..04425966 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.9.21", + "version": "0.9.22", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 40867a5d..c431eb1d 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -189,17 +189,34 @@ export function deleteProfile(id: number) { } } -export function setUserID(id: number) { +const serializeUser = (user: Profile): Profile => ({ + ...user, + user: undefined, +}) + +export async function setUserID(id: number) { const pd = get(profileData) if (id == -1) { resetProfile() return } - const prof = pd.profiles.find((p) => p.id == id) - profile.set(prof ?? getDefaultProfile()) + let prof = pd.profiles.find((p) => p.id == id) + + if (!prof) return profile.update(() => getDefaultProfile()) + prof = serializeUser(prof) + profileData.update((p) => ({ ...p, profile: id })) + if (prof?.jwt) { + const user = await userFromJwt(prof.jwt, prof.instance) + instance.set(prof.instance) + prof.user = user?.user + site.set(user?.site) + } + + profile.update(() => prof ?? getDefaultProfile()) + return prof } diff --git a/src/lib/components/input/Button.svelte b/src/lib/components/input/Button.svelte index edf7e185..8d61634d 100644 --- a/src/lib/components/input/Button.svelte +++ b/src/lib/components/input/Button.svelte @@ -54,6 +54,7 @@ const buttonRoundness = { pill: 'rounded-full', + lg: 'rounded-lg', md: 'rounded-md', none: '', } diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 92de61c4..96a54b01 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -1,4 +1,5 @@