impr: fetch post data from feeds to display page instantly
This commit is contained in:
4 files changed
+297
-223
No files matched your search
@@ -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,
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user