diff --git a/package.json b/package.json index 0d60b9f0..967b8aba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.9.14", + "version": "0.9.15", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/auth.ts b/src/lib/auth.ts index a28ca64d..40867a5d 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -105,6 +105,8 @@ export async function setUser(jwt: string, inst: string, username: string) { content: 'Failed to fetch your user. Is your instance down?', type: 'error', }) + + return } instance.set(inst) @@ -117,7 +119,7 @@ export async function setUser(jwt: string, inst: string, username: string) { id: id, instance: inst, jwt: jwt, - username: username, + username: user.user.local_user_view.person.name, } profile.set({ diff --git a/src/lib/components/ui/sidebar/Sidebar.svelte b/src/lib/components/ui/sidebar/Sidebar.svelte index 43634a37..c42d8369 100644 --- a/src/lib/components/ui/sidebar/Sidebar.svelte +++ b/src/lib/components/ui/sidebar/Sidebar.svelte @@ -78,7 +78,7 @@ class:hidden={!$userSettings.expandSidebar} class="flex flex-col gap-0" > - {prof.username} + {prof.username ?? prof.user?.local_user_view.person.name} {prof.instance} diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index 21fce159..0bc39ec5 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -64,12 +64,6 @@ label="Username" placeholder="Example" class="flex-1" - on:input={(e) => { - if (e.detail.data == '@') { - document.getElementById('instance_url')?.focus() - data.username = data.username.replace('@', '') - } - }} required /> {#if !LINKED_INSTANCE_URL}