From 5aebb5639f7730493e7f663faf1bde430774627e Mon Sep 17 00:00:00 2001 From: James Xylight Date: Sun, 9 Feb 2025 09:54:26 -0800 Subject: [PATCH] feat: add externalInteraction page, close #489 --- .../externalInteraction/+page.svelte | 36 +++++++++++++++++++ .../activitypub/externalInteraction/+page.ts | 19 ++++++++++ src/routes/login/+page.svelte | 3 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/routes/activitypub/externalInteraction/+page.svelte create mode 100644 src/routes/activitypub/externalInteraction/+page.ts diff --git a/src/routes/activitypub/externalInteraction/+page.svelte b/src/routes/activitypub/externalInteraction/+page.svelte new file mode 100644 index 00000000..f2520dc1 --- /dev/null +++ b/src/routes/activitypub/externalInteraction/+page.svelte @@ -0,0 +1,36 @@ + + +
+ {#await data.resolved} + + {$t('routes.search.federating')}... + {:then object} +
+ {#if object.community} + + {:else if object.person} + + {:else if object.post} + + {:else if object.comment} + + {/if} +
+ {/await} +
diff --git a/src/routes/activitypub/externalInteraction/+page.ts b/src/routes/activitypub/externalInteraction/+page.ts new file mode 100644 index 00000000..473920d9 --- /dev/null +++ b/src/routes/activitypub/externalInteraction/+page.ts @@ -0,0 +1,19 @@ +import { profile } from '$lib/auth.svelte.js' +import { client } from '$lib/lemmy.js' +import { error, redirect } from '@sveltejs/kit' + +export const ssr = false + +export async function load({ fetch, url }) { + const uri = url.searchParams.get('uri') + if (!uri) error(404) + + if (!profile.data.jwt) + redirect(302, `/login?ref=${encodeURIComponent(url.toString())}`) + + return { + resolved: client({ func: fetch }).resolveObject({ + q: uri, + }), + } +} diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index ecda9f85..4ee63627 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -34,7 +34,8 @@ children?: import('svelte').Snippet } - let { ref = '/', children }: Props = $props() + let { ref = page.url.searchParams.get('redirect') ?? '/', children }: Props = + $props() let data = $state({ instance: DEFAULT_INSTANCE_URL,