From e8cea7e6ff8ab1895015a71900ad124668453176 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Tue, 5 Aug 2025 12:43:47 -0700 Subject: [PATCH] impr: sync changes to post page with feed --- .../post/[instance]/[id=integer]/+page.svelte | 34 +++++++++++-------- .../post/[instance]/[id=integer]/+page.ts | 2 ++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 4c43c683..f983e535 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -15,7 +15,7 @@ import { publishedToDate } from '$lib/components/util/date.js' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import { t } from '$lib/i18n/translations.js' - import { getClient } from '$lib/lemmy.svelte.js' + import { client } from '$lib/lemmy.svelte.js' import { resumables } from '$lib/lemmy/item.js' import { settings } from '$lib/settings.svelte.js' import { isImage } from '$lib/ui/image.js' @@ -36,23 +36,25 @@ let { data } = $props() - onMount(async () => { - if ( - !(data.post.value.post_view.read && settings.markPostsAsRead) && - profile.current?.jwt - ) { - getClient().markPostAsRead({ - read: settings.markPostsAsRead, - post_ids: [data.post.value.post_view.post.id], - }) - } - + onMount(() => { resumables.add({ name: data.post.value.post_view.post.name, type: 'post', url: page.url.toString(), avatar: data.post.value.post_view.post.thumbnail_url, }) + + if ( + !(data.post.value.post_view.read && settings.markPostsAsRead) && + profile.current?.jwt + ) { + client() + .markPostAsRead({ + read: true, + post_ids: [data.post.value.post_view.post.id], + }) + .then(() => (data.post.value.post_view.read = true)) + } }) $effect(() => { @@ -74,7 +76,7 @@ async function reloadComments() { loading = true - data.comments.value = getClient().getComments({ + data.comments.value = client().getComments({ page: 1, limit: 25, type_: 'All', @@ -133,7 +135,11 @@ i.community.id == data.post.value.post_view.community.id, + ) + ? 'Subscribed' + : 'NotSubscribed'} badges={{ deleted: data.post.value.post_view.post.deleted, removed: data.post.value.post_view.post.removed, diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts index 7f243055..9becf426 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.ts +++ b/src/routes/post/[instance]/[id=integer]/+page.ts @@ -59,6 +59,8 @@ function findInFeed( i => i.post.id == postId, ) + if (index ?? -1 == -1) return + return { post_view: postFeeds.value[feedId]?.data.posts.posts[index], feedData: {