diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 9b8bdb0a..ee0087b6 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -6,7 +6,6 @@ import { toast } from 'mono-svelte' import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' import { client, getClient } from '$lib/lemmy.js' import { site } from './lemmy' -import { userSettings } from '$lib/settings.js' import { instanceToURL, moveItem } from '$lib/util.js' import { LemmyHttp, @@ -18,7 +17,7 @@ import { derived, get, writable, type Writable } from 'svelte/store' import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js' import { browser } from '$app/environment' import { env } from '$env/dynamic/public' -import type { ResumableItem } from './lemmy/item' +import { t } from './translations' const getDefaultProfile = (): Profile => ({ id: -1, @@ -169,7 +168,7 @@ profileData.subscribe(async (pd) => { { id: 1, instance: DEFAULT_INSTANCE_URL, - username: 'Guest', + username: t.get('account.guest') || 'Guest', }, ], profile: 1, @@ -218,25 +217,23 @@ export async function setUser(jwt: string, inst: string, username: string) { }) if (!user?.user) { toast({ - content: 'Failed to fetch your user. Is your instance down?', + content: 'Failed to fetch your user.', type: 'error', }) - - return } instance.set(inst) profileData.update((pd) => { // too lazy to make a decent system - const id = Math.floor(Math.random() * 100000) + 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, + username: user?.user?.local_user_view.person.name, + avatar: user?.user?.local_user_view.person.avatar } return { @@ -257,8 +254,9 @@ async function userFromJwt( let timer = setTimeout( () => toast({ - content: `It's taking a while to fetch your user. Is your instance down?`, + content: `Still loading your user data...`, type: 'warning', + loading: true }), 5000 ) @@ -288,21 +286,16 @@ export function resetProfile() { } export function deleteProfile(id: number) { - const pd = get(profileData) + profileData.update((pd) => { + const index = pd.profiles.findIndex((p) => p.id == id) + if (index <= -1) return pd + + pd.profiles.splice(index, 1) - const index = pd.profiles.findIndex((p) => p.id == id) - if (index <= -1) return - - pd.profiles.splice(index, 1) - - profileData.update((p) => ({ - ...p, - profiles: pd.profiles, - })) - - if (id == get(profile)?.id) { - resetProfile() - } + if (id == pd.profile) resetProfile() + + return pd + }) } function serializeUser(user: Profile): Profile { diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index fd92efa9..30b383c0 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -13,68 +13,9 @@ import { afterNavigate, beforeNavigate } from '$app/navigation' import { _posts } from '../../../../../routes/+page.svelte' - type PostViewWithCrossposts = PostView & { - withCrossposts: true - crossposts: PostView[] - } - type PostViewWithoutCrossposts = PostView & { withCrossposts?: false } - export let posts: PostView[] export let community: boolean = false - const addCrosspostProperty = ( - post: PostView, - crossposts: PostView[] - ): PostViewWithCrossposts => ({ - ...post, - crossposts: crossposts, - withCrossposts: true, - }) - - const combineCrossposts = ( - posts: PostView[] - ): (PostViewWithCrossposts | PostViewWithoutCrossposts)[] => { - const urlMap = new Map< - string, - PostViewWithCrossposts | PostViewWithoutCrossposts - >() - const results: (PostViewWithCrossposts | PostViewWithoutCrossposts)[] = [] - const seenUrls = new Set() - - posts?.forEach((post) => { - if ( - !post || - ($userSettings.hidePosts.deleted && post.post.deleted) || - ($userSettings.hidePosts.removed && post.post.removed) - ) - return - if (!post?.post?.url) { - results.push(post) - return - } - - let existing = urlMap.get(post.post.url) - if (existing) { - existing.withCrossposts = true - if (existing.withCrossposts) { - existing.crossposts = [...(existing.crossposts || []), post] - } - - urlMap.set(post.post.url, existing) - } else { - urlMap.set(post.post.url, post) - results.push(post) - } - seenUrls.add(post.post.url) - }) - - return results - } - - // $: combinedPosts = combineCrossposts(posts) - - let viewPost: number = -1 - const virtualizer = createWindowVirtualizer({ count: posts.length, estimateSize: () => 150, @@ -125,16 +66,14 @@ {:else} - -
- { - posts = posts.toSpliced(row.index, 1) - }} - > - - - - - + > + {/if} {/each}
- - {/if} diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 1034432c..dc71d80d 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -532,7 +532,8 @@ "unblockUser": "Unblocked that user.", "purgeUser": "Purged that user.", "settingsImport": "Successfully imported settings", - "settingsImportWarning": "The imported settings don't seem valid. Are you sure you want to import this?" + "settingsImportWarning": "The imported settings don't seem valid. Are you sure you want to import this?", + "userLoading": "Still loading your user data..." }, "settings": { "title": "Settings", diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 16ed7109..022cce52 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -19,7 +19,7 @@ export const shouldReload = ( cache: CachedPosts | undefined, params: string, - instance: string + instance: string, ): boolean => cache?.instance != instance || cache?.params.toString() != params @@ -57,7 +57,6 @@ try { loading = true - console.log(`loading more with cursor ${data.cursor.next}`) const newPosts = await getClient() .getPosts({ limit: limit,