From 315958365410b949feb7074afb8a464c0166f66d Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sun, 2 Jul 2023 14:27:04 -0700 Subject: [PATCH] feat: Add instance changing --- src/hooks.server.ts | 26 +++++++++++++++++++ src/lib/components/Navbar.svelte | 15 ++++++++++- src/lib/components/markdown/Markdown.svelte | 7 ++++++ src/lib/lemmy.ts | 7 +++++- src/lib/ui/image.ts | 2 ++ src/routes/+layout.server.ts | 7 ++++++ src/routes/+layout.svelte | 4 ++- src/routes/+page.server.ts | 13 +++++----- src/routes/c/[name]/+layout.server.ts | 5 ---- src/routes/c/[name]/+layout.ts | 5 ++++ src/routes/c/[name]/posts/+page.server.ts | 4 +-- src/routes/communities/+page.server.ts | 14 +++++------ src/routes/instance/+page.svelte | 28 +++++++++++++++++++++ src/routes/instance_url/+server.ts | 15 +++++++++++ src/routes/post/[id]/+page.server.ts | 10 +++++--- src/routes/post/[id]/Comment.svelte | 7 +++--- src/routes/post/[id]/Post.svelte | 8 +++--- 17 files changed, 142 insertions(+), 35 deletions(-) create mode 100644 src/hooks.server.ts create mode 100644 src/lib/components/markdown/Markdown.svelte create mode 100644 src/lib/ui/image.ts create mode 100644 src/routes/+layout.server.ts delete mode 100644 src/routes/c/[name]/+layout.server.ts create mode 100644 src/routes/c/[name]/+layout.ts create mode 100644 src/routes/instance/+page.svelte create mode 100644 src/routes/instance_url/+server.ts diff --git a/src/hooks.server.ts b/src/hooks.server.ts new file mode 100644 index 00000000..d4599e5e --- /dev/null +++ b/src/hooks.server.ts @@ -0,0 +1,26 @@ +import { instance_url } from '$lib/lemmy.js' + +export async function handle({ event, resolve }) { + // annoying hack to fix lemmy's CORS + if (event.url.pathname.startsWith('/cors')) { + const instance = `${event.url.pathname.split('/')[2]}` + const url = `${event.url.pathname + .split('/') + .slice(3) + .join('/')}?${event.url.searchParams.toString()}` + + event.request.headers.delete('origin') + event.request.headers.delete('host') + + const data = await fetch(`https://${instance}/${url.toString()}`, { + method: event.request.method, + body: event.request.body, + headers: event.request.headers, + }) + + return new Response(JSON.stringify(await data.json())) + } + + const response = await resolve(event) + return response +} diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index ebaa9b2e..080885ce 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -1,6 +1,8 @@