diff --git a/bun.lockb b/bun.lockb index dc2b665a..ffd0b54b 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 12d5bbdb..c43a8754 100644 --- a/package.json +++ b/package.json @@ -3,23 +3,23 @@ "version": "2.1.0", "license": "AGPL-3.0-only", "devDependencies": { - "@dicebear/core": "^8.0.1", - "@dicebear/initials": "^8.0.1", - "@eslint/compat": "^1.2.9", - "@eslint/js": "^9.28.0", - "@svelte-put/qr": "^2.0.0", + "@dicebear/core": "^8.0.2", + "@dicebear/initials": "^8.0.2", + "@eslint/compat": "^1.3.2", + "@eslint/js": "^9.36.0", + "@svelte-put/qr": "^2.1.0", "@sveltejs/adapter-auto": "^3.3.1", - "@sveltejs/adapter-node": "^5.2.9", - "@sveltejs/adapter-static": "^3.0.8", - "@sveltejs/kit": "^2.17.1", + "@sveltejs/adapter-node": "^5.3.2", + "@sveltejs/adapter-static": "^3.0.9", + "@sveltejs/kit": "^2.42.2", "@sveltejs/vite-plugin-svelte": "^4.0.4", "@tailwindcss/container-queries": "^0.1.1", - "@tailwindcss/postcss": "^4.1.8", - "@types/nprogress": "^0.2.0", + "@tailwindcss/postcss": "^4.1.13", + "@types/nprogress": "^0.2.3", "@types/ua-parser-js": "^0.7.39", "@xylightdev/svelte-hero-icons": "^2.2.7", - "eslint": "^9.28.0", - "eslint-plugin-svelte": "^3.11.0", + "eslint": "^9.36.0", + "eslint-plugin-svelte": "^3.12.3", "jsdom": "^22.1.0", "lemmy-js-client": "0.19.11-donation-dialog.1", "linkify-it": "^5.0.0", @@ -27,23 +27,23 @@ "marked-linkify-it": "^3.1.13", "nprogress": "^0.2.0", "openapi-fetch": "^0.14.0", - "postcss": "^8.4.30", - "prettier": "^3.3.3", + "postcss": "^8.5.6", + "prettier": "^3.6.2", "prettier-plugin-svelte": "^3.4.0", - "svelte": "^5.37.3", + "svelte": "^5.39.2", "svelte-adapter-bun-next": "^1.0.3", - "svelte-check": "^4.0.0", - "svelte-floating-ui": "^1.5.9", + "svelte-check": "^4.3.1", + "svelte-floating-ui": "^1.6.2", "svelte-focus-trap": "^1.2.0", "svelte-infinite-scroll": "^2.0.1", "svelte-markdown": "^0.4.1", "sveltekit-i18n": "^2.4.2", - "tailwindcss": "^4.1.8", - "tslib": "^2.4.1", - "typescript": "^5.5.0", - "typescript-eslint": "^8.33.1", - "ua-parser-js": "^1.0.38", - "vite": "^5.4.14" + "tailwindcss": "^4.1.13", + "tslib": "^2.8.1", + "typescript": "^5.9.2", + "typescript-eslint": "^8.44.0", + "ua-parser-js": "^1.0.41", + "vite": "^5.4.20" }, "overrides": { "svelte": "^5.37.3" diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index 80aacbc6..bfe00e39 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -131,13 +131,22 @@
+ {#if node.comment_view.counts.child_count > 0} + {@const children = node.comment_view.counts.child_count} +
+ {children} +
+ {/if}
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 28af3eb8..d9a1d1b9 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -943,6 +943,9 @@ "openImage": "Open image: {{default}}", "openLink": "Open link: {{default}}", "openPost": "Open post: {{default}}" + }, + "comments": { + "children": "{{childCount}} children" } }, "stats": { diff --git a/src/lib/lemmy/feeds/feed.svelte.ts b/src/lib/lemmy/feeds/feed.svelte.ts index a0f06284..400ac527 100644 --- a/src/lib/lemmy/feeds/feed.svelte.ts +++ b/src/lib/lemmy/feeds/feed.svelte.ts @@ -79,6 +79,11 @@ export interface FeedTypes { posts: GetPost comments: GetComments preload?: PostView + thread: { + showContext?: boolean + singleThread?: boolean + focus?: string + } }, { post: PostView @@ -88,12 +93,15 @@ export interface FeedTypes { cross_posts: PostView[] post_view: PostView }> - thread: { - showContext?: boolean - singleThread?: boolean - focus?: string + params: { + posts: GetPost + comments: GetComments + thread: { + showContext?: boolean + singleThread?: boolean + focus?: string + } } - params: { posts: GetPost; comments: GetComments } }, ] '/f/[id]': [ diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index ebc76ebf..0f166587 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -95,7 +95,7 @@ submit = false, color = 'secondary', size = 'md', - rounding = size == 'lg' ? 'xl' : 'lg', + rounding = 'xl', alignment = 'center', shadow = color != 'tertiary' ? 'none' : 'none', disabled, diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 2836ccaf..8e5383be 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -1,18 +1,23 @@ +{#snippet itemInfo()} + + {#if item.moderatee} + + {/if} +
+ {item.content} +
+{/snippet} + @@ -28,18 +41,10 @@ user={item.moderator} /> {:else} -

Hidden

+

Unknown

{/if} - - - - - {#if item.moderatee} - - {/if} - {#if item.community} - {#if item.content} -

{item.content}

- {/if} + {#if item.reason}

{item.reason}

{/if} - - {#if item.link} - + + {#if item.content} + {/if} diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 2469a0fb..2cc8034e 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -73,7 +73,7 @@ }) .then((i) => i.comments) loading = false - data.data.value.thread.singleThread = false + data.data.value.params.thread.singleThread = false } let tags = $derived.by<{ title?: string; tags: Tag[] }>(() => { @@ -217,28 +217,28 @@ {/await} {#await data.data.value.comments then comments} - {#if data.data.value.thread.showContext || data.data.value.thread.singleThread} + {#if data.data.value.params.thread.showContext || data.data.value.params.thread.singleThread}