From 14789bd5ba26a761dff16d43710ac2dea8130ac3 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 2 Aug 2024 13:12:38 -0700 Subject: [PATCH] fix: spoiler support --- src/lib/components/markdown/Markdown.svelte | 100 ++++++++++-------- .../markdown/renderers/MdCode.svelte | 1 - .../markdown/renderers/MdImage.svelte | 2 +- .../markdown/renderers/MdParagraph.svelte | 2 +- .../markdown/renderers/MdSpoiler.svelte | 32 ++++-- src/lib/ui/image.ts | 4 +- .../post/[instance]/[id=integer]/+page.svelte | 4 +- 7 files changed, 85 insertions(+), 60 deletions(-) diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index ddd5aef9..2386ac66 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -1,6 +1,55 @@ + +
-
diff --git a/src/lib/components/markdown/renderers/MdCode.svelte b/src/lib/components/markdown/renderers/MdCode.svelte index c02a01f1..fd346ae2 100644 --- a/src/lib/components/markdown/renderers/MdCode.svelte +++ b/src/lib/components/markdown/renderers/MdCode.svelte @@ -9,7 +9,6 @@ code: string lang?: string } { - console.log(raw) const match = /^```(.*)/gi.exec(src) if (match?.[1]) { diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte index 8d8e2bd9..e8fba1b6 100644 --- a/src/lib/components/markdown/renderers/MdImage.svelte +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -15,7 +15,7 @@
{#if type == 'video' || type == 'embed' || type == 'iframe'} diff --git a/src/lib/components/markdown/renderers/MdParagraph.svelte b/src/lib/components/markdown/renderers/MdParagraph.svelte index 071e08a1..00f09bc9 100644 --- a/src/lib/components/markdown/renderers/MdParagraph.svelte +++ b/src/lib/components/markdown/renderers/MdParagraph.svelte @@ -1,3 +1,3 @@ -

+

diff --git a/src/lib/components/markdown/renderers/MdSpoiler.svelte b/src/lib/components/markdown/renderers/MdSpoiler.svelte index bbd5b58f..1cafa00b 100644 --- a/src/lib/components/markdown/renderers/MdSpoiler.svelte +++ b/src/lib/components/markdown/renderers/MdSpoiler.svelte @@ -1,17 +1,37 @@ -{@html html} + +
+ +
+ +
diff --git a/src/lib/ui/image.ts b/src/lib/ui/image.ts index 71b2c90b..69c95a75 100644 --- a/src/lib/ui/image.ts +++ b/src/lib/ui/image.ts @@ -2,7 +2,7 @@ export const isImage = (url: string | undefined) => { try { if (!url) return false - return /\.(jpeg|jpg|gif|png|svg|bmp|webp)$/i.test(new URL(url).pathname) + return /\.(jpeg|jpg|gif|png|svg|bmp|webp)$/i.test(url) } catch (err) { return false } @@ -12,7 +12,7 @@ export const isVideo = (url: string | undefined) => { try { if (!url) return false - return /\.(mp4|mov|webm|mkv)$/i.test(new URL(url).pathname) + return /\.(mp4|mov|webm|mkv)$/i.test(url) } catch (err) { return false } diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index 027fa678..25cde5b6 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -234,9 +234,7 @@ opened /> {#if post.post_view.post.body} -
+
{/if}