From d444f5328670f5dfe23e9cafba51ad4374b86c79 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Tue, 9 Apr 2024 23:38:48 -1000
Subject: [PATCH] Last fix for today

---
 database/entities/Status.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/database/entities/Status.ts b/database/entities/Status.ts
index 11fef76f..3f80e4b4 100644
--- a/database/entities/Status.ts
+++ b/database/entities/Status.ts
@@ -245,16 +245,17 @@ export const replaceTextMentions = async (
         // Replace @username and @username@domain
         if (mention.instanceId) {
             finalText = finalText.replace(
-                new RegExp(
-                    `@${mention.username}@${mention.instance?.base_url}`,
-                    "g",
-                ),
-                `<a class="u-url mention" rel="nofollow noopener noreferrer" target="_blank" href="${mention.uri}">@${mention.username}@${mention.instance?.base_url}</a>`,
+                `@${mention.username}@${mention.instance?.base_url}`,
+                `<a class="u-url mention" rel="nofollow noopener noreferrer" target="_blank" href="${getUserUri(
+                    mention,
+                )}">@${mention.username}@${mention.instance?.base_url}</a>`,
             );
         } else {
             finalText = finalText.replace(
-                new RegExp(`@${mention.username}`, "g"),
-                `<a class="u-url mention" rel="nofollow noopener noreferrer" target="_blank" href="${mention.uri}">@${mention.username}</a>`,
+                `@${mention.username}`,
+                `<a class="u-url mention" rel="nofollow noopener noreferrer" target="_blank" href="${getUserUri(
+                    mention,
+                )}">@${mention.username}</a>`,
             );
         }
     }