From 948ad6fb1cd1204b08857b18ebd7aebc9a03d7b8 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 5 Jul 2023 16:11:11 -0700 Subject: [PATCH] feat: FINALLY i fixed image posting --- src/hooks.server.ts | 18 +++++++++++++-- src/routes/create/post/+page.svelte | 34 +++++++++++++++++++---------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 941fe430..1ed56b8f 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -23,10 +23,23 @@ export async function handle({ event, resolve }) { try { const url = buildUrl(event.url) + let headers: Headers = event.request.headers + + headers.delete('origin') + headers.delete('host') + + if ( + event.request.method == 'POST' && + url.pathname == '/pictrs/image' && + url.searchParams.get('auth') + ) { + headers.set('cookie', `jwt=${url.searchParams.get('auth')}`) + } + const data = await fetch(url, { method: event.request.method, + headers: headers, body: event.request.body, - headers: event.request.headers, // @ts-ignore this works, idk why typescript complains duplex: 'half', signal: AbortSignal.timeout(20 * 1000), @@ -60,12 +73,13 @@ export async function handle({ event, resolve }) { status: data.status, }) } catch (error) { + console.log(error) return new Response( JSON.stringify({ message: 'the proxy failed to fetch from server', }), { - status: 200, + status: 500, } ) } diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index 2013cca4..b054da6b 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -29,24 +29,30 @@ } async function uploadImage( - image: FileList | null | undefined + image: File | null | undefined ): Promise { if (!image || !$authData) return - try { - const res = await getClient().uploadImage({ - image: image[0], + const formData = new FormData() + formData.append('images[]', image) + + const response = await fetch( + `${buildBaseUrl($authData.instance)}/pictrs/image?${new URLSearchParams({ auth: $authData.token, - }) - - if (!res.url) { - throw new Error('Failed to upload image') + })}`, + { + method: 'POST', + body: formData, } + ) - return res.url - } catch (err) { - throw new Error('Failed to upload image.') + const json = await response.json() + + if (json.msg == 'ok') { + return `https://${$authData.instance}/pictrs/image/${json.files?.[0]?.file}` } + + throw new Error(`error uploading image: ${response.status}`) } async function submit() { @@ -55,7 +61,7 @@ data.loading = true try { - let image = data.image ? await uploadImage(data.image) : undefined + let image = data.image ? await uploadImage(data.image[0]) : undefined const post = await getClient().createPost({ auth: $authData.token, @@ -82,6 +88,10 @@ 'A cool photo I took before the destruction of mankind!', 'AITA for ending all contention and causing world peace?', 'BREAKING NEWS: Police break into gun shop, find weapons', + 'How do I make sure my pet rock stays alive?', + 'My cat just invented a time machine, what do I do?', + 'Unpopular opinion: world peace and global happiness would be beneficial to humanity', + 'LPT: The smaller weights are easier to lift than the bigger weights in a gym', ] const placeholder =