impr: fetch post data from feeds to display page instantly

This commit is contained in:
James Xylight committed 2025-08-05 12:41:40 -07:00
1 parent 172da3b025
commit ea5124df77
4 files changed
+297 -223

No files matched your search

@@ -91,6 +91,7 @@
MenuButton,
modal,
removeToast,
Spinner,
toast,
} from 'mono-svelte'
import {
@@ -111,29 +112,28 @@
subscribing: false,
})
async function subscribe() {
async function subscribe(community: CommunityView) {
if (!profile.current?.jwt) return
loading.subscribing = true
const subscribed =
community_view.subscribed == 'Subscribed' ||
community_view.subscribed == 'Pending'
community.subscribed == 'Subscribed' || community.subscribed == 'Pending'
try {
await getClient().followCommunity({
community_id: community_view.community.id,
community_id: community.community.id,
follow: !subscribed,
})
} catch (err) {
toast({ content: errorMessage(err as string), type: 'error' })
}
community_view.subscribed = subscribed ? 'NotSubscribed' : 'Subscribed'
addSubscription(community_view.community, !subscribed)
community.subscribed = subscribed ? 'NotSubscribed' : 'Subscribed'
addSubscription(community.community, !subscribed)
loading.subscribing = false
}
interface Props {
community_view: CommunityView
community_view: CommunityView | Promise<CommunityView>
moderators?: CommunityModeratorView[]
class?: string
}
@@ -145,200 +145,207 @@
}: Props = $props()
</script>
<div
class={[
'min-w-full pt-0 text-slate-600 dark:text-zinc-400 flex flex-col gap-4 text-sm',
clazz,
]}
>
<Entity
name={community_view.community.title}
label="!{fullCommunityName(
community_view.community.name,
community_view.community.actor_id,
)}"
{#await community_view}
<div class="w-full h-full grid place-items-center">
<Spinner width={24} />
</div>
{:then community_view}
<div
class={[
'min-w-full pt-0 text-slate-600 dark:text-zinc-400 flex flex-col gap-4 text-sm',
clazz,
]}
>
{#snippet customIcon()}
<Avatar
width={32}
url={community_view.community.icon}
alt={community_view.community.name}
circle={false}
/>
{/snippet}
</Entity>
<div class="flex flex-col gap-1">
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable bind:open={settings.expand.about} class="pt-0!">
{#snippet title()}
<span class="py-1 px-1 flex gap-1 items-center w-full">
{$t('cards.site.about')}
<hr
class="w-full flex-1 ml-1 border-slate-200 dark:border-zinc-800"
/>
</span>
{/snippet}
<Markdown source={community_view.community.description} />
</Expandable>
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable bind:open={settings.expand.stats}>
{#snippet title()}
<span class="py-1 px-1 flex gap-1 items-center w-full">
{$t('cards.site.stats')}
<hr
class="w-full flex-1 ml-1 border-slate-200 dark:border-zinc-800"
/>
</span>
{/snippet}
<div class="flex flex-row gap-4 flex-wrap">
<LabelStat
label={$t('cards.community.members')}
content={community_view.counts.subscribers.toString()}
formatted
<Entity
name={community_view.community.title}
label="!{fullCommunityName(
community_view.community.name,
community_view.community.actor_id,
)}"
>
{#snippet customIcon()}
<Avatar
width={32}
url={community_view.community.icon}
alt={community_view.community.name}
circle={false}
/>
<LabelStat
label={$t('content.posts')}
content={community_view.counts.posts.toString()}
formatted
/>
</div>
</Expandable>
{/snippet}
</Entity>
{#if moderators && moderators.length > 0}
<div class="flex flex-col gap-1">
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable bind:open={settings.expand.team}>
<Expandable bind:open={settings.expand.about} class="pt-0!">
{#snippet title()}
<span class="py-1 px-1 flex gap-1 items-center w-full">
{$t('cards.community.moderators')}
{$t('cards.site.about')}
<hr
class="w-full flex-1 ml-1 border-slate-200 dark:border-zinc-800"
/>
</span>
{/snippet}
<ItemList
items={moderators.map(m => ({
id: m.moderator.id,
name: m.moderator.name,
url: userLink(m.moderator),
avatar: m.moderator.avatar,
instance: new URL(m.moderator.actor_id).hostname,
}))}
/>
<Markdown source={community_view.community.description} />
</Expandable>
{/if}
</div>
<div class="flex flex-row items-center gap-1 sticky bottom-0 w-full">
{#if profile.current?.jwt}
<Button
disabled={loading.subscribing}
loading={loading.subscribing}
size="md"
rounding="pill"
color={community_view.subscribed == 'Subscribed'
? 'secondary'
: 'primary'}
onclick={subscribe}
class="px-4 relative z-[inherit]"
>
{#snippet prefix()}
<Icon
src={community_view.subscribed == 'Subscribed' ? Check : Plus}
mini
size="16"
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable bind:open={settings.expand.stats}>
{#snippet title()}
<span class="py-1 px-1 flex gap-1 items-center w-full">
{$t('cards.site.stats')}
<hr
class="w-full flex-1 ml-1 border-slate-200 dark:border-zinc-800"
/>
</span>
{/snippet}
<div class="flex flex-row gap-4 flex-wrap">
<LabelStat
label={$t('cards.community.members')}
content={community_view.counts.subscribers.toString()}
formatted
/>
{/snippet}
{community_view.subscribed == 'Subscribed' ||
community_view.subscribed == 'Pending'
? $t('cards.community.subscribed')
: $t('cards.community.subscribe')}
</Button>
{/if}
{#if profile.current?.user && amMod(profile.current.user, community_view.community)}
<Button
href="/c/{fullCommunityName(
community_view.community.name,
community_view.community.actor_id,
)}/settings"
size="square-md"
rounding="pill"
>
{#snippet prefix()}
<Icon src={Cog6Tooth} mini size="16" />
{/snippet}
</Button>
{/if}
<Menu placement="top-end">
{#snippet target()}
<Button size="square-md" rounding="pill">
{#snippet prefix()}
<Icon src={EllipsisHorizontal} size="16" mini />
<LabelStat
label={$t('content.posts')}
content={community_view.counts.posts.toString()}
formatted
/>
</div>
</Expandable>
{#if moderators && moderators.length > 0}
<hr class="border-slate-200 dark:border-zinc-900 my-1" />
<Expandable bind:open={settings.expand.team}>
{#snippet title()}
<span class="py-1 px-1 flex gap-1 items-center w-full">
{$t('cards.community.moderators')}
<hr
class="w-full flex-1 ml-1 border-slate-200 dark:border-zinc-800"
/>
</span>
{/snippet}
</Button>
{/snippet}
<MenuButton href="/modlog?community={community_view.community.id}">
<Icon src={Newspaper} size="16" mini />
{$t('cards.community.modlog')}
</MenuButton>
<ItemList
items={moderators.map(m => ({
id: m.moderator.id,
name: m.moderator.name,
url: userLink(m.moderator),
avatar: m.moderator.avatar,
instance: new URL(m.moderator.actor_id).hostname,
}))}
/>
</Expandable>
{/if}
</div>
<div class="flex flex-row items-center gap-1 sticky bottom-0 w-full">
{#if profile.current?.jwt}
<MenuButton
color="danger-subtle"
size="lg"
onclick={() =>
block(community_view.community.id, !community_view.blocked)}
<Button
disabled={loading.subscribing}
loading={loading.subscribing}
size="md"
rounding="pill"
color={community_view.subscribed == 'Subscribed'
? 'secondary'
: 'primary'}
onclick={() => subscribe(community_view)}
class="px-4 relative z-[inherit]"
>
{#snippet prefix()}
<Icon src={NoSymbol} size="16" mini />
<Icon
src={community_view.subscribed == 'Subscribed' ? Check : Plus}
mini
size="16"
/>
{/snippet}
{community_view.blocked
? $t('cards.community.unblock')
: $t('cards.community.block')}
{community_view.subscribed == 'Subscribed' ||
community_view.subscribed == 'Pending'
? $t('cards.community.subscribed')
: $t('cards.community.subscribe')}
</Button>
{/if}
{#if profile.current?.user && amMod(profile.current.user, community_view.community)}
<Button
href="/c/{fullCommunityName(
community_view.community.name,
community_view.community.actor_id,
)}/settings"
size="square-md"
rounding="pill"
>
{#snippet prefix()}
<Icon src={Cog6Tooth} mini size="16" />
{/snippet}
</Button>
{/if}
<Menu placement="top-end">
{#snippet target()}
<Button size="square-md" rounding="pill">
{#snippet prefix()}
<Icon src={EllipsisHorizontal} size="16" mini />
{/snippet}
</Button>
{/snippet}
<MenuButton href="/modlog?community={community_view.community.id}">
<Icon src={Newspaper} size="16" mini />
{$t('cards.community.modlog')}
</MenuButton>
{#if profile.current?.user}
{#if profile.current?.jwt}
<MenuButton
color="danger-subtle"
size="lg"
onclick={() => blockInstance(community_view.community.instance_id)}
>
{#snippet prefix()}
<Icon src={BuildingOffice2} size="16" mini />
{/snippet}
{$t('cards.community.blockInstance')}
</MenuButton>
{/if}
{#if profile.current?.user && isAdmin(profile.current.user)}
<MenuButton
color="danger-subtle"
onclick={() =>
modal({
title: $t('admin.purgeCommunity.title'),
body: `${community_view.community.title}: ${$t('admin.purgeCommunity.warning')}`,
actions: [
action({
close: true,
content: $t('common.cancel'),
}),
action({
action: () => purgeCommunity(community_view.community.id),
close: true,
content: $t('admin.purge'),
type: 'danger',
icon: Fire,
}),
],
dismissable: true,
type: 'error',
})}
block(community_view.community.id, !community_view.blocked)}
>
{#snippet prefix()}
<Icon src={Fire} size="16" mini />
<Icon src={NoSymbol} size="16" mini />
{/snippet}
{$t('admin.purge')}
{community_view.blocked
? $t('cards.community.unblock')
: $t('cards.community.block')}
</MenuButton>
{#if profile.current?.user}
<MenuButton
color="danger-subtle"
size="lg"
onclick={() =>
blockInstance(community_view.community.instance_id)}
>
{#snippet prefix()}
<Icon src={BuildingOffice2} size="16" mini />
{/snippet}
{$t('cards.community.blockInstance')}
</MenuButton>
{/if}
{#if profile.current?.user && isAdmin(profile.current.user)}
<MenuButton
color="danger-subtle"
onclick={() =>
modal({
title: $t('admin.purgeCommunity.title'),
body: `${community_view.community.title}: ${$t('admin.purgeCommunity.warning')}`,
actions: [
action({
close: true,
content: $t('common.cancel'),
}),
action({
action: () => purgeCommunity(community_view.community.id),
close: true,
content: $t('admin.purge'),
type: 'danger',
icon: Fire,
}),
],
dismissable: true,
type: 'error',
})}
>
{#snippet prefix()}
<Icon src={Fire} size="16" mini />
{/snippet}
{$t('admin.purge')}
</MenuButton>
{/if}
{/if}
{/if}
</Menu>
</Menu>
</div>
</div>
</div>
{/await}
@@ -20,7 +20,7 @@
import { settings } from '$lib/settings.svelte.js'
import { isImage } from '$lib/ui/image.js'
import { Button, toast } from 'mono-svelte'
import { onMount } from 'svelte'
import { onMount, untrack } from 'svelte'
import {
ArrowLeft,
ArrowRight,
@@ -32,6 +32,7 @@
import { fly } from 'svelte/transition'
import CommentProvider from './CommentProvider.svelte'
import { ReactiveState } from '$lib/promise.svelte'
import { postFeeds } from '$lib/lemmy/postfeed.svelte'
let { data } = $props()
@@ -54,6 +55,21 @@
})
})
$effect(() => {
data.post.value.meta.then(
res => (data.post.value.post_view = res.post_view),
)
})
$effect(() => {
if (data.cachedFeed && data.post.value.post_view) {
untrack(() => {
const { id, index } = data.cachedFeed!
postFeeds.value[id].data.posts.posts[index] = data.post.value.post_view
})
}
})
let loading = $state(false)
async function reloadComments() {
@@ -117,7 +133,7 @@
<PostMeta
community={data.post.value.post_view.community}
user={data.post.value.post_view.creator}
subscribed={data.post.value.community_view.subscribed}
subscribed="NotSubscribed"
badges={{
deleted: data.post.value.post_view.post.deleted,
removed: data.post.value.post_view.post.removed,
@@ -171,34 +187,36 @@
})}
/>
</div>
{#if data.post.value.cross_posts?.length > 0}
{@const crossposts = data.post.value.cross_posts}
<Expandable
class="text-base mt-2 w-full cursor-pointer"
open={crossposts?.length <= 3}
>
{#snippet title()}
<div
class="flex items-center gap-1 w-full text-left text-base font-normal"
>
<span class="font-bold">{crossposts.length}</span>
{$t('routes.post.crosspostCount')}
<hr
class="flex-1 inline-block w-full border-slate-200 dark:border-zinc-800 mx-3"
/>
</div>
{/snippet}
<div
class="divide-y! divide-slate-200 dark:divide-zinc-800 flex flex-col"
{#await data.post.value.meta then meta}
{@const crossposts = meta.cross_posts}
{#if crossposts?.length > 0}
<Expandable
class="text-base mt-2 w-full cursor-pointer"
open={crossposts?.length <= 3}
>
{#key crossposts}
{#each crossposts as crosspost (crosspost.post.id)}
<Post view="compact" post={crosspost} />
{/each}
{/key}
</div>
</Expandable>
{/if}
{#snippet title()}
<div
class="flex items-center gap-1 w-full text-left text-base font-normal"
>
<span class="font-bold">{crossposts.length}</span>
{$t('routes.post.crosspostCount')}
<hr
class="flex-1 inline-block w-full border-slate-200 dark:border-zinc-800 mx-3"
/>
</div>
{/snippet}
<div
class="divide-y! divide-slate-200 dark:divide-zinc-800 flex flex-col"
>
{#key crossposts}
{#each crossposts as crosspost (crosspost.post.id)}
<Post view="compact" post={crosspost} />
{/each}
{/key}
</div>
</Expandable>
{/if}
{/await}
</article>
{#if data.thread.value.showContext || data.thread.value.singleThread}
<div
@@ -266,7 +284,7 @@
{@const comments = new ReactiveState(passedComments)}
<CommentProvider
comments={comments.value}
post={data.post.value}
post={data.post.value.post_view}
focus={data.thread.value.focus}
onupdate={reloadComments}
bind:sort={data.commentSort.value}
@@ -2,10 +2,26 @@ import { resolveRoute } from '$app/paths'
import { profile } from '$lib/auth.svelte.js'
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
import { client } from '$lib/lemmy.svelte.js'
import { postFeeds } from '$lib/lemmy/postfeed.svelte.js'
import { ReactiveState, awaitIfServer } from '$lib/promise.svelte.js'
import { settings } from '$lib/settings.svelte'
import { redirect } from '@sveltejs/kit'
import type { GetComments } from 'lemmy-js-client'
import type {
GetComments,
PostView,
CommunityModeratorView,
CommunityView,
} from 'lemmy-js-client'
interface PartialPost {
post_view: PostView
meta: Promise<{
community_view: CommunityView
moderators: Array<CommunityModeratorView>
cross_posts: Array<PostView>
post_view: PostView
}>
}
function buildContext(thread?: string) {
let parentId: number | undefined
@@ -27,6 +43,31 @@ function buildContext(thread?: string) {
return { parentId, showContext, max_depth, focus: thread?.split('.').at(-1) }
}
function findInFeed(
postId: number,
feedId: 'main' | 'community',
):
| {
post_view: PostView
feedData?: {
id: 'main' | 'community'
index: number
}
}
| undefined {
const index = postFeeds.value[feedId]?.data.posts.posts.findIndex(
i => i.post.id == postId,
)
return {
post_view: postFeeds.value[feedId]?.data.posts.posts[index],
feedData: {
id: feedId,
index: index,
},
}
}
export async function load({ params, url, fetch }) {
if (profile.current.instance != params.instance)
redirect(302, resolveRoute('/post/[instance]/[id]/confirm', params))
@@ -34,14 +75,19 @@ export async function load({ params, url, fetch }) {
// TODO use Lemmy profile default settings
const sort = settings?.defaultSort?.comments ?? 'Hot'
const { parentId, showContext, max_depth, focus } = buildContext(
const { parentId, showContext, focus } = buildContext(
url.searchParams.get('thread') || undefined,
)
const cachedPost =
findInFeed(Number(params.id), 'main') ??
findInFeed(Number(params.id), 'community')
const max_depth = (cachedPost?.post_view.counts.comments ?? 0) > 100 ? 1 : 3
const commentParams: GetComments = {
post_id: Number(params.id),
type_: 'All',
limit: 50,
page: 1,
max_depth: max_depth,
saved_only: false,
@@ -50,26 +96,34 @@ export async function load({ params, url, fetch }) {
}
const comments = client({ func: fetch }).getComments(commentParams)
const post = await client({ func: fetch }).getPost({
const post = client({ func: fetch }).getPost({
id: Number(params.id),
})
const partialPost: PartialPost = {
post_view: cachedPost ? cachedPost.post_view : (await post).post_view,
meta: post.then(i => ({
...i,
})),
}
return {
thread: new ReactiveState({
showContext: showContext,
singleThread: parentId != undefined,
focus,
}),
post: new ReactiveState(post),
post: new ReactiveState(partialPost),
commentSort: new ReactiveState(sort),
comments: new ReactiveState((await awaitIfServer(comments)).data),
slots: {
sidebar: {
component: CommunityCard,
props: {
community_view: post.community_view,
community_view: post.then(i => i.community_view),
},
},
},
cachedFeed: cachedPost?.feedData,
}
}
@@ -12,7 +12,7 @@
import type {
CommentSortType,
GetCommentsResponse,
GetPostResponse,
PostView,
} from 'lemmy-js-client'
import { Button, Option, Select } from 'mono-svelte'
import { onMount } from 'svelte'
@@ -28,7 +28,7 @@
} from 'svelte-hero-icons'
interface Props {
post: GetPostResponse
post: PostView
comments: GetCommentsResponse
sort?: CommentSortType
onupdate?: () => void
@@ -68,13 +68,12 @@
<Button
color="primary"
rounding="xl"
disabled={(post.post_view.post.locked ||
post.post_view.banned_from_community) &&
disabled={(post.post.locked || post.banned_from_community) &&
!(
profile.current?.user?.local_user_view.local_user.admin ||
profile.current?.user?.moderates
.map(c => c.community.id)
.includes(post.community_view.community.id)
.includes(post.community.id)
)}
onclick={() => (commenting = true)}
>
@@ -116,7 +115,7 @@
</EndPlaceholder>
{:else}
<CommentForm
postId={post.post_view.post.id}
postId={post.post.id}
oncomment={comment => {
comments.comments.unshift(comment.comment_view)
}}
@@ -157,15 +156,11 @@
</div>
{/if}
{#if virtualize}
<CommentListVirtualizer
post={post.post_view.post}
nodes={tree}
scrollTo={focus}
/>
<CommentListVirtualizer post={post.post} nodes={tree} scrollTo={focus} />
{:else}
<div class="divide-y divide-slate-200 dark:divide-zinc-800">
<div class="-mx-3 sm:-mx-6 px-3 sm:px-6">
<Comments nodes={tree} post={post.post_view.post} />
<Comments nodes={tree} post={post.post} />
</div>
</div>
{/if}