diff --git a/package.json b/package.json
index 203fb6b5..ac045159 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "photon-lemmy",
- "version": "1.22.1",
+ "version": "1.22.2",
"private": true,
"scripts": {
"dev": "vite dev",
diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte
index 6e3e1fc1..5dcae33e 100644
--- a/src/lib/components/lemmy/comment/Comments.svelte
+++ b/src/lib/components/lemmy/comment/Comments.svelte
@@ -21,7 +21,10 @@
export let isParent: boolean
export let post: Post
+ let hydrated = false
+
onMount(() => {
+ hydrated = true
if (isParent && $page.url.hash) {
document.getElementById($page.url.hash)?.scrollIntoView({
behavior: 'smooth',
@@ -116,12 +119,10 @@
{/if}
{#if node.comment_view.counts.child_count > 0 && node.children.length == 0}
-
-
+
{/if}
{/each}
diff --git a/src/routes/comment/[instance]/+page.ts b/src/routes/comment/[instance]/+page.ts
index 7cec2e91..ecf16638 100644
--- a/src/routes/comment/[instance]/+page.ts
+++ b/src/routes/comment/[instance]/+page.ts
@@ -2,5 +2,6 @@ import { getInstance } from '$lib/lemmy.js'
import { redirect } from '@sveltejs/kit'
export function load({ params }) {
+ // If you somehow got to /comment/instance, it likely means you passed in an ID, not an instance.
throw redirect(300, `/comment/${getInstance()}/${params.instance}`)
}
diff --git a/src/routes/comment/[instance]/[id]/+page.ts b/src/routes/comment/[instance]/[id]/+page.ts
index d220aab4..ca9aae0b 100644
--- a/src/routes/comment/[instance]/[id]/+page.ts
+++ b/src/routes/comment/[instance]/[id]/+page.ts
@@ -10,6 +10,6 @@ export async function load({ params, fetch }) {
throw redirect(
300,
- `/post/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`
+ `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`
)
}
diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte
index fca2308d..742d7bac 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/+page.svelte
@@ -1,5 +1,8 @@