From 98a899c596bbd690bde7f99f911e1e62fc06fbd6 Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 2 Aug 2024 12:18:43 -0700 Subject: [PATCH] feat: switch to svelte-markdown --- src/lib/components/lemmy/post/helpers.ts | 6 +- .../lemmy/post/media/PostIframe.svelte | 16 +-- .../lemmy/post/media/PostMedia.svelte | 2 +- src/lib/components/markdown/Markdown.svelte | 67 ++++++++- src/lib/components/markdown/markdown.ts | 86 ------------ .../markdown/renderers/Heading.svelte | 23 ---- .../markdown/renderers/MdCode.svelte | 57 ++++++++ .../markdown/renderers/MdHeading.svelte | 20 +++ .../components/markdown/renderers/MdHr.svelte | 1 + .../markdown/renderers/MdHtml.svelte | 7 + .../markdown/renderers/MdImage.svelte | 43 +++++- .../markdown/renderers/MdLink.svelte | 24 ++++ .../markdown/renderers/MdList.svelte | 19 +++ .../markdown/renderers/MdParagraph.svelte | 3 + .../markdown/renderers/MdQuote.svelte | 3 + .../markdown/renderers/MdSpoiler.svelte | 17 +++ .../markdown/renderers/MdText.svelte | 19 +++ .../components/markdown/renderers/index.ts | 35 +++++ .../components/markdown/renderers/plugins.ts | 33 +++++ .../markdown/renderers/spoiler/spoiler.ts | 129 ++++++++++++++++++ .../markdown/renderers/table/MdTable.svelte | 3 + .../renderers/table/MdTableBody.svelte | 1 + .../renderers/table/MdTableCell.svelte | 27 ++++ .../renderers/table/MdTableHead.svelte | 1 + .../renderers/table/MdTableRow.svelte | 1 + src/routes/util/photonify/+page.svelte | 2 +- src/style/app.css | 4 +- 27 files changed, 510 insertions(+), 139 deletions(-) delete mode 100644 src/lib/components/markdown/markdown.ts delete mode 100644 src/lib/components/markdown/renderers/Heading.svelte create mode 100644 src/lib/components/markdown/renderers/MdCode.svelte create mode 100644 src/lib/components/markdown/renderers/MdHeading.svelte create mode 100644 src/lib/components/markdown/renderers/MdHr.svelte create mode 100644 src/lib/components/markdown/renderers/MdHtml.svelte create mode 100644 src/lib/components/markdown/renderers/MdLink.svelte create mode 100644 src/lib/components/markdown/renderers/MdList.svelte create mode 100644 src/lib/components/markdown/renderers/MdParagraph.svelte create mode 100644 src/lib/components/markdown/renderers/MdQuote.svelte create mode 100644 src/lib/components/markdown/renderers/MdSpoiler.svelte create mode 100644 src/lib/components/markdown/renderers/MdText.svelte create mode 100644 src/lib/components/markdown/renderers/index.ts create mode 100644 src/lib/components/markdown/renderers/spoiler/spoiler.ts create mode 100644 src/lib/components/markdown/renderers/table/MdTable.svelte create mode 100644 src/lib/components/markdown/renderers/table/MdTableBody.svelte create mode 100644 src/lib/components/markdown/renderers/table/MdTableCell.svelte create mode 100644 src/lib/components/markdown/renderers/table/MdTableHead.svelte create mode 100644 src/lib/components/markdown/renderers/table/MdTableRow.svelte diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index 110ef830..c35d7f40 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -79,9 +79,9 @@ export const mediaType = (url?: string, view: View = 'cozy'): MediaType => { return 'none' } -export const iframeType = (post: Post): IframeType => { - if (isVideo(post.url)) return 'video' - if (isYoutubeLink(post.url)) return 'youtube' +export const iframeType = (url: string): IframeType => { + if (isVideo(url)) return 'video' + if (isYoutubeLink(url)) return 'youtube' return 'none' } diff --git a/src/lib/components/lemmy/post/media/PostIframe.svelte b/src/lib/components/lemmy/post/media/PostIframe.svelte index 9cd710a6..00fb948a 100644 --- a/src/lib/components/lemmy/post/media/PostIframe.svelte +++ b/src/lib/components/lemmy/post/media/PostIframe.svelte @@ -41,6 +41,7 @@ export let thumbnail: string | undefined = undefined export let url: string export let opened = !$userSettings.embeds.clickToView + export let autoplay: boolean = $userSettings.embeds.clickToView const urlToEmbed = (inputUrl: string) => { if (type == 'video') { @@ -52,11 +53,10 @@ const videoID = youtubeVideoID(inputUrl) - if ($userSettings.embeds.clickToView) - url.searchParams.set('autoplay', '1') + if (autoplay) url.searchParams.set('autoplay', '1') return `https://${youtubeDomain( - $userSettings.embeds.youtube, + $userSettings.embeds.youtube )}/embed/${videoID}?${url.searchParams.toString()}` } @@ -64,7 +64,7 @@ } const typeData = ( - type: IframeType, + type: IframeType ): { icon: IconSource text: string @@ -102,11 +102,7 @@ {#if opened} {#if type == 'video'} -