From c2850a34ae38bea15c05ca1f7c453ef90cd14e08 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 11 Jan 2023 17:18:06 +0000
Subject: [PATCH] fix: use mention accts within a status to render links (#955)

---
 components/status/StatusBody.vue              |  1 +
 composables/content-parse.ts                  | 20 +++++++++++++++++++
 tests/__snapshots__/content-rich.test.ts.snap | 13 ++++++++++++
 tests/content-rich.test.ts                    |  9 +++++++--
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index d91b5ad9..eab2637f 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -17,6 +17,7 @@ const vnode = $computed(() => {
     return null
   const vnode = contentToVNode(status.content, {
     emojis: emojisObject.value,
+    mentions: 'mentions' in status ? status.mentions : undefined,
     markdown: true,
   })
   return vnode
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
index 683e93d1..dea3d5b2 100644
--- a/composables/content-parse.ts
+++ b/composables/content-parse.ts
@@ -8,6 +8,7 @@ import { emojiRegEx, getEmojiAttributes } from '../config/emojis'
 
 export interface ContentParseOptions {
   emojis?: Record<string, mastodon.v1.CustomEmoji>
+  mentions?: mastodon.v1.StatusMention[]
   markdown?: boolean
   replaceUnicodeEmoji?: boolean
   astTransforms?: Transform[]
@@ -47,6 +48,7 @@ export function parseMastodonHTML(
     markdown = true,
     replaceUnicodeEmoji = true,
     convertMentionLink = false,
+    mentions,
   } = options
 
   if (markdown) {
@@ -74,6 +76,9 @@ export function parseMastodonHTML(
   if (markdown)
     transforms.push(transformMarkdown)
 
+  if (mentions?.length)
+    transforms.push(createTransformNamedMentions(mentions))
+
   if (convertMentionLink)
     transforms.push(transformMentionLink)
 
@@ -377,3 +382,18 @@ function transformMentionLink(node: Node): string | Node | (string | Node)[] | n
   }
   return node
 }
+
+function createTransformNamedMentions(mentions: mastodon.v1.StatusMention[]) {
+  return (node: Node): string | Node | (string | Node)[] | null => {
+    if (node.name === 'a' && node.attributes.class?.includes('mention')) {
+      const href = node.attributes.href
+      const mention = href && mentions.find(m => m.url === href)
+      if (mention) {
+        node.attributes.href = `/${currentServer.value}/@${mention.acct}`
+        node.children = [h('span', { 'data-type': 'mention', 'data-id': mention.acct }, `@${mention.username}`)]
+        return node
+      }
+    }
+    return node
+  }
+}
diff --git a/tests/__snapshots__/content-rich.test.ts.snap b/tests/__snapshots__/content-rich.test.ts.snap
index 1dde47cf..c7202ea1 100644
--- a/tests/__snapshots__/content-rich.test.ts.snap
+++ b/tests/__snapshots__/content-rich.test.ts.snap
@@ -40,6 +40,19 @@ exports[`content-rich > custom emoji 1`] = `
 
 exports[`content-rich > empty 1`] = `""`;
 
+exports[`content-rich > group mention > html 1`] = `
+"<p>
+  <span class=\\"h-card\\"
+    ><a
+      class=\\"u-url mention\\"
+      rel=\\"nofollow noopener noreferrer\\"
+      to=\\"//@pilipinas@lemmy.ml\\"
+    ></a
+  ></span>
+</p>
+"
+`;
+
 exports[`content-rich > handles html within code blocks 1`] = `
 "<p>
   HTML block code:<br />
diff --git a/tests/content-rich.test.ts b/tests/content-rich.test.ts
index 700fe4ff..c3df5b0c 100644
--- a/tests/content-rich.test.ts
+++ b/tests/content-rich.test.ts
@@ -20,6 +20,11 @@ describe('content-rich', () => {
     expect(formatted).toMatchSnapshot()
   })
 
+  it('group mention', async () => {
+    const { formatted } = await render('<p><span class="h-card"><a href="https://lemmy.ml/c/pilipinas" class="u-url mention" rel="nofollow noopener noreferrer" target="_blank">@<span>pilipinas</span></a></span></p>', undefined, [{ id: '', username: 'pilipinas', url: 'https://lemmy.ml/c/pilipinas', acct: 'pilipinas@lemmy.ml' }])
+    expect(formatted).toMatchSnapshot('html')
+  })
+
   it('inline code with link', async () => {
     const { formatted } = await render('<p>Inline code with link: `<a href="https://api.iconify.design/noto.css?icons=1st-place-medal,2nd-place-medal" target="_blank" rel="nofollow noopener noreferrer" class="status-link unhandled-link" title="https://api.iconify.design/noto.css?icons=1st-place-medal,2nd-place-medal"><span class="invisible">https://</span><span class="ellipsis">api.iconify.design/noto.css?ic</span><span class="invisible">ons=1st-place-medal,2nd-place-medal</span></a>`</p>')
     expect(formatted).toMatchSnapshot()
@@ -64,8 +69,8 @@ describe('content-rich', () => {
   })
 })
 
-async function render(content: string, emojis?: Record<string, mastodon.v1.CustomEmoji>) {
-  const vnode = contentToVNode(content, { emojis })
+async function render(content: string, emojis?: Record<string, mastodon.v1.CustomEmoji>, mentions?: mastodon.v1.StatusMention[]) {
+  const vnode = contentToVNode(content, { emojis, mentions })
   const html = (await renderToString(vnode))
     .replace(/<!--[\[\]]-->/g, '')
   let formatted = ''