From b4bcadf40d1685954c6560a7691b25b408131fe5 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Mon, 31 Jul 2023 13:00:35 -0700 Subject: [PATCH] misc: re-add markdown to posts --- src/lib/components/lemmy/post/Post.svelte | 14 ++++++++----- src/lib/components/markdown/markdown.ts | 25 +++++++++++++++++------ src/routes/+layout.svelte | 4 +++- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 012f82a0..93642719 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -8,6 +8,7 @@ import PostLink from '$lib/components/lemmy/post/PostLink.svelte' import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js' + import Markdown from '$lib/components/markdown/Markdown.svelte' export let post: PostView export let actions: boolean = true @@ -102,14 +103,17 @@ /> {/if} {#if post.post.body && !post.post.nsfw} -

- {post.post.body.length > 350 - ? `${post.post.body.slice(0, 350)}...` - : post.post.body} -

+ 350 + ? `${post.post.body.slice(0, 350)}...` + : post.post.body} + /> + {/if} {/if} {#if actions} diff --git a/src/lib/components/markdown/markdown.ts b/src/lib/components/markdown/markdown.ts index 176f4fc1..7baa4340 100644 --- a/src/lib/components/markdown/markdown.ts +++ b/src/lib/components/markdown/markdown.ts @@ -22,12 +22,25 @@ export const md = new MarkdownIt({ }, }) -export const mdInline: MarkdownIt = new MarkdownIt('zero').enable([ - 'emphasis', - 'backticks', - 'strikethrough', - 'link', -]) +export const mdInline: MarkdownIt = new MarkdownIt('zero') + .enable(['emphasis', 'backticks', 'strikethrough', 'link']) + .use(markdown_it_container, 'spoiler', { + validate: (params: string) => { + return params.trim().match(/^spoiler+(.*)/) + }, + + render: (tokens: any, idx: any) => { + var m = tokens[idx].info.trim().match(/^spoiler+(.*)/) + + if (tokens[idx].nesting === 1) { + // opening tag + return `
${md.utils.escapeHtml(m[1])} \n` + } else { + // closing tag + return '
\n' + } + }, + }) md.linkify.add('!', { validate: function (text, pos, self) { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b29db210..7383e38d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -53,7 +53,9 @@ Frontpage {#if $user} - {#each $user.follows.map((f) => f.community) as follow} + {#each $user.follows + .map((f) => f.community) + .sort((a, b) => a.title.localeCompare(b.title)) as follow}