From 18010722a22e9e4cbcd03ac0a217a22ad8ae7ed2 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 13 Jul 2023 10:51:11 -0700 Subject: [PATCH] feat: Switch to getSite().my_user instead of a hacky workaround --- src/lib/components/lemmy/Post.svelte | 17 ++++++++++++++++- src/lib/components/lemmy/SiteCard.svelte | 6 +++--- src/lib/components/ui/Navbar.svelte | 9 +++------ src/lib/components/ui/StickyCard.svelte | 2 +- src/lib/lemmy.ts | 19 ++++++++++--------- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/lib/components/lemmy/Post.svelte b/src/lib/components/lemmy/Post.svelte index 8a463665..7dee086a 100644 --- a/src/lib/components/lemmy/Post.svelte +++ b/src/lib/components/lemmy/Post.svelte @@ -89,6 +89,21 @@ class="rounded-md max-h-[32rem] w-full max-w-full" /> + {:else if postRes.post.embed_video_url} +
+ + +
+ {:else if postRes.post.thumbnail_url} +
+ {postRes.post.name} +
{/if} {#if postRes.post.body && !postRes.post.nsfw}

Copy Link - {#if $user?.person_view.person.id == postRes.post.creator_id} + {#if $user?.person.id == postRes.post.creator_id} Delete diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index f94ab720..ae4d40fb 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -18,9 +18,9 @@ - - - + {#if site.site.icon} + + {/if} diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index d83b2711..57c67698 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -77,7 +77,7 @@ > {#if $user} - {$user ? $user.person_view.person.name : 'Profile'} + {$user ? $user.person.name : 'Profile'} @@ -103,10 +103,7 @@ Log in {:else} - + Profile diff --git a/src/lib/components/ui/StickyCard.svelte b/src/lib/components/ui/StickyCard.svelte index ff3198a3..67e431fd 100644 --- a/src/lib/components/ui/StickyCard.svelte +++ b/src/lib/components/ui/StickyCard.svelte @@ -1,7 +1,7 @@

diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 9cf7bd04..aa6356df 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -2,11 +2,13 @@ import { type GetPersonDetailsResponse, LemmyHttp, type LoginResponse, + type Person, + type PersonView, } from 'lemmy-js-client' import { get, writable } from 'svelte/store' import { PUBLIC_PROXY_URL } from '$env/static/public' -export const DEFAULT_INSTANCE_URL = 'lemmy.ml' +export const DEFAULT_INSTANCE_URL = 'lemmy.world' export let instance_url = writable(DEFAULT_INSTANCE_URL) export let corsSupported = writable(true) @@ -43,9 +45,7 @@ export interface UserData { } export const authData = writable() -export const user = writable< - (GetPersonDetailsResponse & UserData) | undefined ->() +export const user = writable<(PersonView & UserData) | undefined>() setInterval(async () => { // check for unread messages @@ -72,14 +72,15 @@ if (typeof localStorage != 'undefined') { } authData.subscribe(async (data) => { - if (!data) return + if (!data?.token) return try { - const person = await getClient().getPersonDetails({ - auth: data?.token, - username: `${data?.username}@${data?.instance}`, + const site = await getClient().getSite({ + auth: data.token, }) - user.set({ ...person, unreads: 0 }) + if (!site.my_user) throw Error('Missing user') + + user.set({ ...site.my_user.local_user_view, unreads: 0 }) if (typeof localStorage != 'undefined') { localStorage.setItem('user', JSON.stringify(data))