diff --git a/src/routes/comment/[instance]/[id]/+page.ts b/src/routes/comment/[instance]/[id]/+page.ts
index 5d6aceb4..b60761f5 100644
--- a/src/routes/comment/[instance]/[id]/+page.ts
+++ b/src/routes/comment/[instance]/[id]/+page.ts
@@ -1,9 +1,14 @@
+import { resolveRoute } from '$app/paths'
+import { profile } from '$lib/auth.svelte.js'
import { client } from '$lib/lemmy.svelte.js'
import { redirect } from '@sveltejs/kit'
export async function load({ params, fetch }) {
+ if (profile.data.instance != params.instance)
+ redirect(302, resolveRoute('/post/[instance]/[id]/confirm', params))
+
const comment = await client({
- instanceURL: params.instance,
+ instanceURL: profile.data.instance,
func: fetch,
}).getComment({
id: Number(params.id),
@@ -11,6 +16,6 @@ export async function load({ params, fetch }) {
redirect(
302,
- `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`,
+ `/post/${profile.data.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`,
)
}
diff --git a/src/routes/comment/[instance]/[id]/confirm/+page.svelte b/src/routes/comment/[instance]/[id]/confirm/+page.svelte
new file mode 100644
index 00000000..cb5c9e2a
--- /dev/null
+++ b/src/routes/comment/[instance]/[id]/confirm/+page.svelte
@@ -0,0 +1,107 @@
+
+
+
+
+
+ {page.params.instance}/comment/{page.params.id}
+
+
+ {$t('routes.postRedirect.title')}
+
+
+ {$t('routes.postRedirect.description', {
+ // @ts-ignore
+ homeInstance: fetched,
+ })}
+
+
+
+ {#if profile.data.jwt}
+
+ {/if}
+
+
+ {#if profileData.profiles}
+ {@const filtered = profileData.profiles.filter(
+ i => i.instance == page.params.instance,
+ )}
+
+
+ {$t('routes.postRedirect.actions.switch', {
+ // @ts-ignore
+ destInstance: page.params.instance,
+ })}
+
+
+ {#each filtered as profile, index}
+
+ {/each}
+
+ {$t('account.addGuest')}
+
+
+
+ {/if}
+
diff --git a/src/routes/comment/[instance]/[id]/confirm/+page.ts b/src/routes/comment/[instance]/[id]/confirm/+page.ts
new file mode 100644
index 00000000..937a8b40
--- /dev/null
+++ b/src/routes/comment/[instance]/[id]/confirm/+page.ts
@@ -0,0 +1,7 @@
+import { profile } from '$lib/auth.svelte.js'
+import { redirect } from '@sveltejs/kit'
+
+export async function load({ params }) {
+ if (profile.data.instance == params.instance)
+ redirect(302, `/comment/${params.instance}/${params.id}`)
+}
diff --git a/src/routes/u/[name]/+page.ts b/src/routes/u/[name]/+page.ts
index 241ef2b8..3ad1a575 100644
--- a/src/routes/u/[name]/+page.ts
+++ b/src/routes/u/[name]/+page.ts
@@ -9,6 +9,8 @@ export async function load({ params, url, fetch }) {
(url.searchParams.get('type') as 'comments' | 'posts') || 'posts'
const sort: SortType = (url.searchParams.get('sort') as SortType) || 'New'
+ console.log(type)
+
const user = await getClient(undefined, fetch).getPersonDetails({
limit: 20,
page: page,
@@ -16,7 +18,7 @@ export async function load({ params, url, fetch }) {
sort: sort,
})
- const items = [...user.posts, ...user.comments]
+ const items = type == 'posts' ? user.posts : user.comments
return {
filters: new ReactiveState({