From 0fbe243f7bb5964687de89201ccdf1966cb083b2 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Fri, 25 Aug 2023 14:39:08 -0700 Subject: [PATCH] feat: add u/ syntax for users --- src/lib/components/markdown/Markdown.svelte | 8 +++- src/lib/components/markdown/markdown.ts | 52 +++++++++++++-------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index 0852821c..decf310f 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -18,10 +18,16 @@ l.href = `/post/${match?.[1]}/${match?.[2]}` }) } + + let div: HTMLElement + + $: if (source && div) { + replaceURLs(div) + }
{#if inline} diff --git a/src/lib/components/markdown/markdown.ts b/src/lib/components/markdown/markdown.ts index fc0a14c5..75cc674e 100644 --- a/src/lib/components/markdown/markdown.ts +++ b/src/lib/components/markdown/markdown.ts @@ -71,13 +71,38 @@ const communityLinks = { return 0 }, normalize: function (match: any) { - let prefix = `${match.url}` + let prefix = match.url prefix = prefix.startsWith('c/') ? prefix.slice(2) : prefix.slice(1) match.url = `/c/${prefix}` }, } +const userLinks = { + validate: function (text: any, pos: any, self: any) { + var tail = text.slice(pos) + + if (!self.re.user) { + self.re.user = new RegExp(/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,6})/) + } + if (self.re.user.test(tail)) { + // Linkifier allows punctuation chars before prefix, + // but we additionally disable `@` ("@@mention" is invalid) + if (pos >= 2 && tail[pos - 2] === '!') { + return false + } + return tail.match(self.re.user)![0].length + } + return 0 + }, + normalize: function (match: any) { + let prefix = match.url + prefix = prefix.startsWith('u/') ? prefix.slice(2) : prefix.slice(1) + + match.url = `/u/${prefix}` + }, +} + md.linkify.add('!', { validate: communityLinks.validate, normalize: communityLinks.normalize, @@ -89,23 +114,10 @@ md.linkify.add('c/', { }) md.linkify.add('@', { - validate: function (text, pos, self) { - var tail = text.slice(pos) - - if (!self.re.user) { - self.re.user = new RegExp(/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z]{2,6})/) - } - if (self.re.user.test(tail)) { - // Linkifier allows punctuation chars before prefix, - // but we additionally disable `@` ("@@mention" is invalid) - if (pos >= 2 && tail[pos - 2] === '@') { - return false - } - return tail.match(self.re.user)![0].length - } - return 0 - }, - normalize: function (match) { - match.url = `/u/${match.url.slice(1)}` - }, + validate: userLinks.validate, + normalize: userLinks.normalize, +}) +md.linkify.add('u/', { + validate: userLinks.validate, + normalize: userLinks.normalize, })