From 87af6183d0740ab1515850fcccb6bef4397cefbf Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 19 Jul 2024 15:42:56 -0700 Subject: [PATCH 1/4] misc: update mono svelte --- bun.lockb | Bin 301210 -> 301210 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/bun.lockb b/bun.lockb index fea12a09efeefbf949c6fe47235355710228cdb1..bbc32c906105f8b5b63f36c51c2db8047fbcf17f 100755 GIT binary patch delta 151 zcmV;I0BHZ3u@aiG5|Az+_Jh|f-wQFSeFe%>N%kj$%mJ6u9|=J>IM9x@3Dj~iu}&Jh z0TYwaE+>-^F9?H}ySJFT0Sz2LLf{F3Wt6PEJXIDAqL;kZM-Xr>>NuCJ*Ne@xXm1+u z|Ck2$0T(Egy)jO?{U;Dt9=9eX-PXm0KVp~nTR&01hvnA+hvnA-x8>IZQjGyQw>V`4 FVl$%1Lsb9( delta 151 zcmV;I0BHZ3u@aiG5|Az+53e+g3=VzSi+jYrM{L@e0f<{VqcVWBQjPzwM?Q8ku}&Jh z0TPqZE+>-^F9?H}ySJFT0Sz2Lz>J`bIkX9&`R+XMG5gm|Uxn7VD}5V6#{4@*r%wej zVnc>Of%$mTHCbYy!U7-+ZZh52+F?<{uM}*+k~E>~hvnA+hvnA-x8>IZQjGyPw>V`4 FVlxFxM9TmG From 4dcbea460339c330dc6e986b0793c16884c6e3c4 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 19 Jul 2024 18:58:44 -0700 Subject: [PATCH 2/4] misc: update username on refreshed login --- src/lib/auth.ts | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 8c9b3709..020e2e31 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -13,7 +13,13 @@ import { type MyUserInfo, type Community, } from 'lemmy-js-client' -import { derived, get, writable, type Readable, type Writable } from 'svelte/store' +import { + derived, + get, + writable, + type Readable, + type Writable, +} from 'svelte/store' import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js' import { browser } from '$app/environment' import { env } from '$env/dynamic/public' @@ -57,7 +63,7 @@ interface ProfileData { defaultInstance?: string } -interface PersonData extends MyUserInfo { } +interface PersonData extends MyUserInfo {} interface Notifications { inbox: number @@ -93,7 +99,7 @@ export let profileData = writable( let fetchUser = { loading: false, - prevProfile: -1 + prevProfile: -1, } export let profile: Readable = derived( @@ -106,7 +112,7 @@ export let profile: Readable = derived( set(profile) if (profile?.jwt) { - if ((profile.id != fetchUser.prevProfile) && !fetchUser.loading) { + if (profile.id != fetchUser.prevProfile && !fetchUser.loading) { site.set(undefined) fetchUser.loading = true @@ -125,6 +131,7 @@ export let profile: Readable = derived( profile.user = res?.user profile.avatar = res?.user?.local_user_view.person.avatar + profile.username = res?.user?.local_user_view.person.name fetchUser.loading = false fetchUser.prevProfile = profile.id @@ -146,7 +153,6 @@ export let profile: Readable = derived( fetchUser.loading = false } } - } ) @@ -223,7 +229,7 @@ export async function setUser(jwt: string, inst: string, username?: string) { }) if (!user?.user) { toast({ - content: 'Your instance\'s API did not return your user data.', + content: "Your instance's API did not return your user data.", type: 'error', }) } @@ -232,14 +238,14 @@ export async function setUser(jwt: string, inst: string, username?: string) { profileData.update((pd) => { // too lazy to make a decent system - const id = Math.max(...pd.profiles.map(p => p.id)) + 1 + const id = Math.max(...pd.profiles.map((p) => p.id)) + 1 const newProfile: Profile = { id: id, instance: inst, jwt: jwt, username: user?.user?.local_user_view.person.name, - avatar: user?.user?.local_user_view.person.avatar + avatar: user?.user?.local_user_view.person.avatar, } return { @@ -254,7 +260,9 @@ export async function setUser(jwt: string, inst: string, username?: string) { async function userFromJwt( jwt: string, instance: string -): Promise<{ user: PersonData | undefined; site: GetSiteResponse } | undefined> { +): Promise< + { user: PersonData | undefined; site: GetSiteResponse } | undefined +> { const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite() let timer = setTimeout( @@ -262,15 +270,19 @@ async function userFromJwt( toast({ content: `Still loading your user data...`, type: 'warning', - loading: true + loading: true, }), 5000 ) - const site = await sitePromise.then((r) => { - clearTimeout(timer) - return r - }).catch((e) => { toast({ content: `Failed to contact the instance. ${e}` }) }) + const site = await sitePromise + .then((r) => { + clearTimeout(timer) + return r + }) + .catch((e) => { + toast({ content: `Failed to contact the instance. ${e}` }) + }) if (!site) return @@ -319,7 +331,7 @@ instance.subscribe(async (i) => { const s = await new LemmyHttp(`https://${i}`).getSite() site.set(s) - } catch (e) { } + } catch (e) {} }) export async function setUserID(id: number) { From 7b40f90c0de93255b466604ddefa5595aeb62564 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 19 Jul 2024 19:58:36 -0700 Subject: [PATCH 3/4] fix: offset lazily --- .../lemmy/post/feed/VirtualFeed.svelte | 27 ++++++++++--------- src/routes/+page.svelte | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index 9980a6fb..4114f9b0 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -37,21 +37,22 @@ export let posts: PostView[] export let community: boolean = false - export let lastSeen: number | undefined = undefined export let feedId: PostFeedID - let combinedPosts = combineCrossposts(posts) - $: combinedPosts = combineCrossposts(posts) - let virtualItemEls: HTMLElement[] = [] let virtualListEl: HTMLElement | undefined = undefined - $: virtualizer = createWindowVirtualizer({ - count: combinedPosts.length, - estimateSize: () => 0, - scrollMargin: virtualListEl?.offsetTop ?? 0, + const virtualizer = createWindowVirtualizer({ + count: posts.length, + estimateSize: () => 150, }) + $: if (posts.length) + $virtualizer.setOptions({ + count: posts.length, + scrollMargin: virtualListEl?.offsetTop, + }) + $: items = $virtualizer.getVirtualItems() $: { if (virtualItemEls.length) @@ -59,12 +60,12 @@ } afterNavigate(() => { + console.log($postFeeds[feedId].lastSeen) $virtualizer.scrollToIndex($postFeeds[feedId].lastSeen ?? 0) }) export let feedData: PostFeed['data'] - const limit = 20 let error: any = undefined let loading = false let hasMore = true @@ -220,15 +221,15 @@ data-index={row.index} class="relative post-container" > - {#if combinedPosts[row.index]} + {#if posts[row.index]} { posts = posts.toSpliced(row.index, 1) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 93c488b2..e57ad0c7 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -37,6 +37,7 @@ +
test
Date: Fri, 19 Jul 2024 19:59:20 -0700 Subject: [PATCH 4/4] remove test --- src/routes/+page.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e57ad0c7..93c488b2 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -37,7 +37,6 @@ -
test