From 76e989f122c14ee91de853e3eca56b16e870ad7d Mon Sep 17 00:00:00 2001 From: Xylight Date: Tue, 16 Sep 2025 17:48:37 -0700 Subject: [PATCH] fact: svelte 5's class reactiveness is balls --- src/lib/components/lemmy/post/PostVote.svelte | 4 +- .../lemmy/post/actions/PostActions.svelte | 10 +- src/lib/mono/modal/Modal.svelte | 21 +-- .../post/[instance]/[id=integer]/+page.svelte | 134 ++++++++++-------- .../post/[instance]/[id=integer]/+page.ts | 31 ++-- 5 files changed, 110 insertions(+), 90 deletions(-) diff --git a/src/lib/components/lemmy/post/PostVote.svelte b/src/lib/components/lemmy/post/PostVote.svelte index a7d409eb..24eeeea9 100644 --- a/src/lib/components/lemmy/post/PostVote.svelte +++ b/src/lib/components/lemmy/post/PostVote.svelte @@ -136,8 +136,8 @@ )}
(debug = true)} title="Debug" size="custom" - color="secondary" + color="ghost" rounding="pill" class={buttonSquare} icon={BugAnt} @@ -143,7 +143,7 @@ {/if} {#if title !== null} -

+

{#if customTitle} {@render customTitle?.()} {:else if title} diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 55615563..e0c2d866 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -32,26 +32,30 @@ import { expoOut } from 'svelte/easing' import { fly } from 'svelte/transition' import CommentProvider from './CommentProvider.svelte' + import { ReactiveState } from '$lib/util.svelte' let { data } = $props() onMount(() => { - data.meta.then((i) => data.post == i.post_view) + data.data.value.meta.then((i) => data.data.value.post == i.post_view) resumables.add({ - name: data.post.post.name, + name: data.data.value.post.post.name, type: 'post', url: page.url.toString(), - avatar: data.post.post.thumbnail_url, + avatar: data.data.value.post.post.thumbnail_url, }) - if (!(data.post.read && settings.markPostsAsRead) && profile.current?.jwt) { + if ( + !(data.data.value.post.read && settings.markPostsAsRead) && + profile.current?.jwt + ) { client() .markPostAsRead({ read: true, - post_ids: [data.post.post.id], + post_ids: [data.data.value.post.post.id], }) - .then(() => (data.post.read = true)) + .then(() => (data.data.value.post.read = true)) } }) @@ -59,28 +63,28 @@ async function reloadComments() { loading = true - data.comments = client() + data.data.value.comments = client() .getComments({ page: 1, limit: 25, type_: 'All', - post_id: data.post.post.id, + post_id: data.data.value.post.post.id, sort: settings.defaultSort.comments, - max_depth: data.post.counts.comments > 100 ? 1 : 3, + max_depth: data.data.value.post.counts.comments > 100 ? 1 : 3, }) .then((i) => i.comments) loading = false - data.thread.singleThread = false + data.data.value.thread.singleThread = false } let tags = $derived.by<{ title?: string; tags: Tag[] }>(() => { - const parsed = parseTags(data.post.post.name) + const parsed = parseTags(data.data.value.post.post.name) return { title: parsed.title, tags: [ ...parsed.tags, - ...(data.post.flair_list?.map((i) => ({ + ...(data.data.value.post.flair_list?.map((i) => ({ content: i.flair_title, color: i.background_color, icon: null, @@ -94,31 +98,40 @@ - {data.post.community.title} | {data.post.post.name} + {data.data.value.post.community.title} | {data.data.value.post.post.name} - - {#if !data.post.post.local} + + {#if !data.data.value.post.post.local} {/if} - - {#if data.post.post.body} - + + {#if data.data.value.post.post.body} + {/if} - {#if mediaType(data.post.post.url) == 'image'} - - - {:else if data.post.post.thumbnail_url} - - + {#if mediaType(data.data.value.post.post.url) == 'image'} + + + {:else if data.data.value.post.post.thumbnail_url} + + {/if} @@ -126,49 +139,50 @@
i.community.id == data.post.community.id, + (i) => i.community.id == data.data.value.post.community.id, ) ? 'Subscribed' : 'NotSubscribed'} badges={{ - deleted: data.post.post.deleted, - removed: data.post.post.removed, - locked: data.post.post.locked, + deleted: data.data.value.post.post.deleted, + removed: data.data.value.post.post.removed, + locked: data.data.value.post.post.locked, featured: - data.post.post.featured_community || data.post.post.featured_local, - nsfw: data.post.post.nsfw, - saved: data.post.saved, - admin: data.post.creator_is_admin, - moderator: data.post.creator_is_moderator, + data.data.value.post.post.featured_community || + data.data.value.post.post.featured_local, + nsfw: data.data.value.post.post.nsfw, + saved: data.data.value.post.saved, + admin: data.data.value.post.creator_is_admin, + moderator: data.data.value.post.creator_is_moderator, }} - published={publishedToDate(data.post.post.published)} - edited={data.post.post.updated} - title={data.post.post.name} + published={publishedToDate(data.data.value.post.post.published)} + edited={data.data.value.post.post.updated} + title={data.data.value.post.post.name} style="width: max-content;" tags={tags.tags} />

- +

- {#if data.post.post.body} + {#if data.data.value.post.post.body}
- +
{/if}
toast({ content: 'The post was edited successfully.', @@ -176,7 +190,7 @@ })} />
- {#await data.meta then meta} + {#await data.data.value.meta then meta} {@const crossposts = meta.cross_posts} {#if crossposts?.length > 0} @@ -203,8 +217,8 @@ {/if} {/await} -{#await data.comments then comments} - {#if data.thread.showContext || data.thread.singleThread} +{#await data.data.value.comments then comments} + {#if data.data.value.thread.showContext || data.data.value.thread.singleThread}
- {data.thread.showContext + {data.data.value.thread.showContext ? $t('routes.post.thread.context') : $t('routes.post.thread.allComments')} {#snippet suffix()} @@ -241,7 +255,7 @@ {$t('routes.post.commentCount')} {#snippet action()} - + {/snippet} @@ -253,7 +267,7 @@ {/if} - {#await data.comments} + {#await data.data.value.comments}
{#each new Array(10) as _, index} {_} @@ -276,10 +290,10 @@ {:then comments} {#if comments.length == 0} @@ -290,12 +304,12 @@ > {/if} {/await} - {#if data.post.counts.comments > 5} + {#if data.data.value.post.counts.comments > 5} {$t('routes.post.commentCount')} {#snippet action()} - {data.post.counts.comments} + {data.data.value.post.counts.comments}