fix: error when switching accounts on virtualfeed
This commit is contained in:
1 parent
b90703d9f8
commit
602af2996c
4 files changed
+36
-151
No files matched your search
+17
-24
@@ -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 {
|
||||
|
||||
@@ -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<string>()
|
||||
|
||||
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 @@
|
||||
</Placeholder>
|
||||
</div>
|
||||
{:else}
|
||||
<!-- {#each combinedPosts as post, index} -->
|
||||
<!-- {#if !($userSettings.hidePosts.deleted && post.post.deleted) && !($userSettings.hidePosts.removed && post.post.removed)} -->
|
||||
<div
|
||||
style="position:relative; height: {browser
|
||||
? `${$virtualizer.getTotalSize()}px`
|
||||
: '100%'}; width: 100%;"
|
||||
>
|
||||
<div
|
||||
style="position: absolute; top: 0; left: 0; width: 100%; transform: translateY({items[0]
|
||||
? items[0].start
|
||||
style="position: absolute; top: 0; left: 0; width: 100%; transform: translateY({items?.[0]
|
||||
? items?.[0]?.start
|
||||
: 0}px);"
|
||||
class="divide-y divide-slate-200 dark:divide-zinc-800"
|
||||
id="feed"
|
||||
@@ -151,72 +90,25 @@
|
||||
data-index={row.index}
|
||||
class="relative post-container"
|
||||
>
|
||||
<Post
|
||||
hideCommunity={community}
|
||||
view={(posts[row.index].post.featured_community ||
|
||||
posts[row.index].post.featured_local) &&
|
||||
$userSettings.posts.compactFeatured
|
||||
? 'compact'
|
||||
: $userSettings.view}
|
||||
post={posts[row.index]}
|
||||
class="transition-all duration-250"
|
||||
on:hide={() => {
|
||||
posts = posts.toSpliced(row.index, 1)
|
||||
}}
|
||||
>
|
||||
<svelte:fragment slot="badges">
|
||||
<!-- {#if posts[index].withCrossposts}
|
||||
<button
|
||||
on:click={() => {
|
||||
if (viewPost == posts[index].post.id) viewPost = -1
|
||||
else viewPost = posts[index].post.id
|
||||
}}
|
||||
>
|
||||
<Badge
|
||||
class="z-10 backdrop-blur-xl hover:brightness-110 cursor-pointer transition-all"
|
||||
color="gray-subtle"
|
||||
>
|
||||
{#if viewPost == posts[index].post.id}
|
||||
<Icon mini src={Minus} size="14" />
|
||||
{:else}
|
||||
<Icon mini src={Plus} size="14" />
|
||||
{/if}
|
||||
{posts[index].crossposts.length} crosspost{posts[index]
|
||||
.crossposts.length == 1
|
||||
? ''
|
||||
: 's'}
|
||||
</Badge>
|
||||
</button>{/if} -->
|
||||
</svelte:fragment>
|
||||
</Post>
|
||||
<!-- {#if posts[index].withCrossposts && viewPost == posts[index].post.id}
|
||||
<div
|
||||
transition:slide|global={{
|
||||
axis: 'y',
|
||||
duration: 500,
|
||||
easing: expoOut,
|
||||
{#if posts[row.index]}
|
||||
<Post
|
||||
hideCommunity={community}
|
||||
view={(posts[row.index]?.post.featured_community ||
|
||||
posts[row.index]?.post.featured_local) &&
|
||||
$userSettings.posts.compactFeatured
|
||||
? 'compact'
|
||||
: $userSettings.view}
|
||||
post={posts?.[row.index]}
|
||||
class="transition-all duration-250"
|
||||
on:hide={() => {
|
||||
posts = posts.toSpliced(row.index, 1)
|
||||
}}
|
||||
>
|
||||
<span
|
||||
class="text-sm flex flex-row gap-2 items-center"
|
||||
class:my-4={$userSettings.view == 'card'}
|
||||
>
|
||||
Crossposts <hr class="w-full dark:border-zinc-800" />
|
||||
{posts[index].crossposts.length}
|
||||
</span>
|
||||
{#each posts[index].crossposts as crosspost, index}
|
||||
<div class="w-full transition-all mb-4">
|
||||
<Post post={crosspost} view={$userSettings.view} />
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{/if} -->
|
||||
></Post>
|
||||
{/if}
|
||||
</li>
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
<!-- {/if} -->
|
||||
<!-- {/each} -->
|
||||
{/if}
|
||||
<slot />
|
||||
</ul>
|
||||
@@ -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",
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
export const shouldReload = (
|
||||
cache: CachedPosts | undefined,
|
||||
params: string,
|
||||
instance: string
|
||||
instance: string,
|
||||
): boolean =>
|
||||
cache?.instance != instance || cache?.params.toString() != params
|
||||
</script>
|
||||
@@ -57,7 +57,6 @@
|
||||
|
||||
try {
|
||||
loading = true
|
||||
console.log(`loading more with cursor ${data.cursor.next}`)
|
||||
const newPosts = await getClient()
|
||||
.getPosts({
|
||||
limit: limit,
|
||||
|
||||
Reference in new issue
Block a user