From 5be48b102ff005f2e5a8f753893c98d67829e268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Sat, 17 Dec 2022 22:30:39 +0800 Subject: [PATCH] fix: don't parse rich content in display name closes #445 --- components/account/AccountHeader.vue | 1 + components/content/ContentRich.setup.ts | 8 +++- composables/content-parse.ts | 64 +++++++++++++------------ composables/content-render.ts | 7 ++- 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue index 68e054b0..24013e03 100644 --- a/components/account/AccountHeader.vue +++ b/components/account/AccountHeader.vue @@ -81,6 +81,7 @@ watchEffect(() => { font-bold sm:text-2xl text-xl :content="getDisplayName(account, { rich: true })" :emojis="account.emojis" + :markdown="false" /> diff --git a/components/content/ContentRich.setup.ts b/components/content/ContentRich.setup.ts index 88c1bfdb..497e4add 100644 --- a/components/content/ContentRich.setup.ts +++ b/components/content/ContentRich.setup.ts @@ -5,13 +5,17 @@ defineOptions({ name: 'ContentRich', }) -const props = defineProps<{ +const { content, emojis, markdown = true } = defineProps<{ content: string + markdown?: boolean emojis?: Emoji[] }>() export default () => h( 'span', { class: 'content-rich' }, - contentToVNode(props.content, emojisArrayToObject(props.emojis || [])), + contentToVNode(content, { + emojis: emojisArrayToObject(emojis || []), + markdown, + }), ) diff --git a/composables/content-parse.ts b/composables/content-parse.ts index 1075e8f7..020969e7 100644 --- a/composables/content-parse.ts +++ b/composables/content-parse.ts @@ -12,7 +12,7 @@ function decode(text: string) { * Parse raw HTML form Mastodon server to AST, * with interop of custom emojis and inline Markdown syntax */ -export function parseMastodonHTML(html: string, customEmojis: Record = {}) { +export function parseMastodonHTML(html: string, customEmojis: Record = {}, markdown = true) { let processed = html // custom emojis .replace(/:([\w-]+?):/g, (_, name) => { @@ -21,45 +21,49 @@ export function parseMastodonHTML(html: string, customEmojis: Record` return `:${name}:` }) + + if (markdown) { // handle code blocks - .replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang, raw) => { - const code = htmlToText(raw) - const classes = lang ? ` class="language-${lang}"` : '' - return `>
${code}
` - }) + processed = processed + .replace(/>(```|~~~)(\w*)([\s\S]+?)\1/g, (_1, _2, lang, raw) => { + const code = htmlToText(raw) + const classes = lang ? ` class="language-${lang}"` : '' + return `>
${code}
` + }) - walkSync(parse(processed), (node) => { - if (node.type !== TEXT_NODE) - return - const replacements = [ - [/\*\*\*(.*?)\*\*\*/g, '$1'], - [/\*\*(.*?)\*\*/g, '$1'], - [/\*(.*?)\*/g, '$1'], - [/~~(.*?)~~/g, '$1'], - [/`([^`]+?)`/g, '$1'], - [/&[^;]+;/g, (val: string) => decode(val)], - ] as any + walkSync(parse(processed), (node) => { + if (node.type !== TEXT_NODE) + return + const replacements = [ + [/\*\*\*(.*?)\*\*\*/g, '$1'], + [/\*\*(.*?)\*\*/g, '$1'], + [/\*(.*?)\*/g, '$1'], + [/~~(.*?)~~/g, '$1'], + [/`([^`]+?)`/g, '$1'], + [/&[^;]+;/g, (val: string) => decode(val)], + ] as any - for (const [re, replacement] of replacements) { - for (const match of node.value.matchAll(re)) { - if (node.loc) { - const start = match.index! + node.loc[0].start - const end = start + match[0].length + node.loc[0].start - processed = processed.slice(0, start) + match[0].replace(re, replacement) + processed.slice(end) - } - else { - processed = processed.replace(match[0], match[0].replace(re, replacement)) + for (const [re, replacement] of replacements) { + for (const match of node.value.matchAll(re)) { + if (node.loc) { + const start = match.index! + node.loc[0].start + const end = start + match[0].length + node.loc[0].start + processed = processed.slice(0, start) + match[0].replace(re, replacement) + processed.slice(end) + } + else { + processed = processed.replace(match[0], match[0].replace(re, replacement)) + } } } - } - }) + }) + } return parse(processed) } -export async function convertMastodonHTML(html: string, customEmojis: Record = {}) { +export function convertMastodonHTML(html: string, customEmojis: Record = {}) { const tree = parseMastodonHTML(html, customEmojis) - return await render(tree) + return render(tree) } export function htmlToText(html: string) { diff --git a/composables/content-render.ts b/composables/content-render.ts index 337a851f..b0a6ef61 100644 --- a/composables/content-render.ts +++ b/composables/content-render.ts @@ -13,9 +13,12 @@ import AccountHoverWrapper from '~/components/account/AccountHoverWrapper.vue' */ export function contentToVNode( content: string, - customEmojis: Record = {}, + { emojis = {}, markdown = true }: { + emojis?: Record + markdown?: boolean + } = {}, ): VNode { - const tree = parseMastodonHTML(content, customEmojis) + const tree = parseMastodonHTML(content, emojis, markdown) return h(Fragment, (tree.children as Node[]).map(n => treeToVNode(n))) }