From fee08ed7edb6c37d47f1868c0ba1e7312cad8d9a Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sat, 19 Aug 2023 15:43:56 -0700 Subject: [PATCH] fix: reactivity issue causing comment tree to rebuild --- package.json | 2 +- .../post/[instance]/[id=integer]/+page.svelte | 98 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 309a59a6..98db39d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.9.11", + "version": "0.9.12", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 06f8f1a9..2896c368 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -26,17 +26,21 @@ export let data + let post = data.post + onMount(async () => { - if (!data.post.post_view.read && $profile?.jwt) { + if (!post.post_view.read && $profile?.jwt) { getClient().markPostAsRead({ auth: $profile.jwt, read: true, - post_id: data.post.post_view.post.id, + post_id: post.post_view.post.id, }) } }) afterNavigate(async () => { + // reactivity hack + post = data.post if ( $page.params.instance.toLowerCase() != $instance.toLowerCase() && $profile?.jwt @@ -49,7 +53,7 @@ try { const res = await getClient().resolveObject({ auth: $profile.jwt, - q: data.post.post_view.post.ap_id, + q: post.post_view.post.ap_id, }) if (res.post) { @@ -76,7 +80,7 @@ page: 1, limit: 25, type_: 'All', - post_id: data.post.post_view.post.id, + post_id: post.post_view.post.id, sort: commentSort, max_depth: 3, }) @@ -84,14 +88,14 @@ - {data.post.post_view.post.name} - + {post.post_view.post.name} + - {#if isImage(data.post.post_view.post.url)} - + {#if isImage(post.post_view.post.url)} + {/if} - {#if data.post.post_view.post.body} - + {#if post.post_view.post.body} + {/if} @@ -113,56 +117,56 @@ {/if} -

{data.post.post_view.post.name}

- {#if isImage(data.post.post_view.post.url)} +

{post.post_view.post.name}

+ {#if isImage(post.post_view.post.url)} {data.post.post_view.post.name} - {:else if isVideo(data.post.post_view.post.url)} + {:else if isVideo(post.post_view.post.url)} - {:else if data.post.post_view.post.url && !data.post.post_view.post.thumbnail_url} + {:else if post.post_view.post.url && !post.post_view.post.thumbnail_url} - {data.post.post_view.post.url} + {post.post_view.post.url} - {:else if data.post.post_view.post.thumbnail_url && data.post.post_view.post.url} + {:else if post.post_view.post.thumbnail_url && post.post_view.post.url} {/if} - {#if data.post.post_view.post.body} + {#if post.post_view.post.body}
- +
{/if}
toast({ content: 'The post was edited successfully.', @@ -170,15 +174,15 @@ })} />
- {#if data.post.cross_posts?.length > 0} + {#if post.cross_posts?.length > 0}
Crossposts - {data.post.cross_posts.length} + {post.cross_posts.length}
- {#each data.post.cross_posts as crosspost} + {#each post.cross_posts as crosspost}
Comments - {data.post.post_view.counts.comments} + {post.post_view.counts.comments}
(comments.comments = [ comment.detail.comment_view, ...comments.comments, ])} - locked={data.post.post_view.post.locked || + locked={post.post_view.post.locked || $page.params.instance.toLowerCase() != $instance.toLowerCase()} /> {/if} @@ -238,11 +242,7 @@
{:then comments} - + {/await} {:catch}