diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 7d79bb23..c070201a 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -286,6 +286,15 @@ "commented": "Your comment was posted.", "loadComments": "Load comments" }, + "postRedirect": { + "title": "Mismatching instance", + "description": "That link resolves to a post not on your account's instance, {{homeInstance}}.", + "actions": { + "back": "Go back", + "fetch": "Locate post on {{homeInstance}}", + "switch": "Switch to an account on {{destInstance}}" + } + }, "inbox": { "title": "Inbox", "markAsRead": "Mark All Read", diff --git a/src/routes/login/guest/+page.svelte b/src/routes/login/guest/+page.svelte index a7a06d49..c0109147 100644 --- a/src/routes/login/guest/+page.svelte +++ b/src/routes/login/guest/+page.svelte @@ -11,13 +11,15 @@ import { goto } from '$app/navigation' import { t } from '$lib/translations' import Header from '$lib/components/ui/layout/pages/Header.svelte' + import { page } from '$app/state' interface Props { ref?: string children?: import('svelte').Snippet } - let { ref = '/', children }: Props = $props() + let { ref = page.url.searchParams.get('redirect') ?? '/', children }: Props = + $props() let form = $state({ instance: '', diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index ee889e78..9e3751cc 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -78,28 +78,6 @@ }) }) - const fetchOnHome = async (jwt: string) => { - const id = toast({ - content: $t('toast.fetchPostOnHome'), - loading: true, - }) - - try { - const res = await getClient().resolveObject({ - q: data.post.value.post_view.post.ap_id, - }) - - if (res.post) { - removeToast(id) - goto(`/post/${instance.data}/${res.post.post.id}`, {}).then(() => - removeToast(id), - ) - } - } catch (err) { - removeToast(id) - } - } - let commentsPage = 1 let loading = $state(false) @@ -117,10 +95,6 @@ data.thread.value.singleThread = false commentsPage = 1 } - - let remoteView = $derived( - page.params.instance?.toLowerCase() != instance.data?.toLowerCase(), - ) @@ -164,44 +138,6 @@
- {#if remoteView} - - {/if} -
+ import { goto } from '$app/navigation' + import { resolveRoute } from '$app/paths' + import { page } from '$app/state' + import { profile, profileData } from '$lib/auth.svelte' + import Header from '$lib/components/ui/layout/pages/Header.svelte' + import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte' + import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte' + import { client } from '$lib/lemmy.svelte' + import { errorMessage } from '$lib/lemmy/error' + import { t } from '$lib/translations' + import { toast } from 'mono-svelte' + import Button from 'mono-svelte/button/Button.svelte' + import Material from 'mono-svelte/materials/Material.svelte' + import { Plus } from 'svelte-hero-icons' + + let loading = $state(false) + const fetched = $state.snapshot(profile.data.instance) + + async function fetchOnHome() { + loading = true + try { + const res = await client().resolveObject({ + q: `https://${page.params.instance}/post/${page.params.id}`, + }) + + if (res.post) { + goto( + resolveRoute(`/post/[instance]/[id]`, { + instance: profile.data.instance, + id: res.post.post.id.toString(), + }), + ) + } + } catch (err) { + toast({ content: errorMessage(err), type: 'error' }) + } + loading = false + } + + +
+
+
+ {page.params.instance}/post/{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/post/[instance]/[id=integer]/confirm/+page.ts b/src/routes/post/[instance]/[id=integer]/confirm/+page.ts new file mode 100644 index 00000000..58b9b9ba --- /dev/null +++ b/src/routes/post/[instance]/[id=integer]/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, `/post/${params.instance}/${params.id}`) +}