From fde0ff509e4ca6fd911315250059351d062dc96f Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Wed, 10 Apr 2024 12:21:42 -1000
Subject: [PATCH] Fixes for mentions being wrong

---
 database/entities/Status.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/database/entities/Status.ts b/database/entities/Status.ts
index 21e36d4b..206faedf 100644
--- a/database/entities/Status.ts
+++ b/database/entities/Status.ts
@@ -221,7 +221,7 @@ export const getDescendants = async (
  */
 export const parseTextMentions = async (text: string) => {
     const mentionedPeople =
-        text.match(/@[a-zA-Z0-9_]+(@[a-zA-Z0-9_]+)?/g) ?? [];
+        text.match(/@[a-zA-Z0-9_]+(@[a-zA-Z0-9_.:]+)?/g) ?? [];
 
     return await client.user.findMany({
         where: {
@@ -301,6 +301,14 @@ export const createNewStatus = async (
 
         htmlContent = linkifyHtml(
             await replaceTextMentions(htmlContent, mentions ?? []),
+            {
+                defaultProtocol: "https",
+                validate: {
+                    email: () => false,
+                },
+                target: "_blank",
+                rel: "nofollow noopener noreferrer",
+            },
         );
     } else {
         htmlContent = "";