diff --git a/package.json b/package.json index 1fa45c5f..4887ec53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.4.7", + "version": "1.5.0", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/auth.ts b/src/lib/auth.ts index c93f912a..cab81aa3 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -32,6 +32,7 @@ export interface Profile { jwt?: string user?: PersonData username?: string + avatar?: string favorites?: number[] color?: string } @@ -89,7 +90,13 @@ profile.subscribe(async (p) => { ...p, user: user!.user, username: user?.user.local_user_view.person.name, + avatar: user?.user.local_user_view.person.avatar, })) + + profile.update((pro) => { + console.log(pro) + return pro + }) }) export async function setUser(jwt: string, inst: string, username: string) { @@ -120,6 +127,7 @@ export async function setUser(jwt: string, inst: string, username: string) { instance: inst, jwt: jwt, username: user.user.local_user_view.person.name, + avatar: user.user.local_user_view.person.avatar, } profile.set({ @@ -212,6 +220,7 @@ export async function setUserID(id: number) { const user = await userFromJwt(prof.jwt, prof.instance) instance.set(prof.instance) prof.user = user?.user + prof.avatar = user?.user.local_user_view.person.avatar site.set(user?.site) } diff --git a/src/lib/components/ui/sidebar/ProfileButton.svelte b/src/lib/components/ui/sidebar/ProfileButton.svelte index f9b0a0e4..170ef6c5 100644 --- a/src/lib/components/ui/sidebar/ProfileButton.svelte +++ b/src/lib/components/ui/sidebar/ProfileButton.svelte @@ -32,10 +32,7 @@ switching = false }} - class="w-full hover:bg-slate-200 {expanded ? '' : '!p-1.5'} {$profile?.id == - prof.id - ? 'font-bold' - : ''}" + class="w-full hover:bg-slate-200 {expanded ? '' : '!p-1.5'}" > - + {prof.username ?? prof.user?.local_user_view.person.name} {prof.instance} diff --git a/src/lib/lemmy/ProfileAvatar.svelte b/src/lib/lemmy/ProfileAvatar.svelte index 1de68ed5..ae55ab2c 100644 --- a/src/lib/lemmy/ProfileAvatar.svelte +++ b/src/lib/lemmy/ProfileAvatar.svelte @@ -9,14 +9,27 @@ {#if profile} - +
+ {#if profile.avatar && !profile.color} + {profile.username} + {:else} + + {/if} +
{/if}