fix(api): 🐛 Fix duplicated mentions, general refactorings

api/api/v1/notifications/index.test.ts

@@ -143,7 +143,7 @@ describe(meta.route, () => {
 
         const objects = (await response.json()) as ApiNotification[];
 
-        expect(objects.length).toBe(2);
+        expect(objects.length).toBe(3);
         // There should be no element with a status with id of timeline[0].id
         expect(objects).not.toContainEqual(
             expect.objectContaining({

api/api/v1/notifications/index.ts

@@ -171,7 +171,7 @@ export default apiRoute((app) =>
             ),
             limit,
             context.req.url,
-            user?.id,
+            user.id,
         );
 
         return context.json(

api/api/v1/statuses/index.test.ts

@@ -310,6 +310,9 @@ describe(meta.route, () => {
 
             const object = (await response.json()) as ApiStatus;
 
+            expect(object.content).toBe(
+                `<p>Hello, <a class="u-url mention" rel="nofollow noopener noreferrer" target="_blank" href="${users[1].getUri()}">@${users[1].data.username}</a>!</p>`,
+            );
             expect(object.mentions).toBeArrayOfSize(1);
             expect(object.mentions[0]).toMatchObject({
                 id: users[1].id,

classes/functions/status.ts

@@ -298,19 +298,16 @@ export const replaceTextMentions = (text: string, mentions: User[]): string => {
             );
         }
 
-        return finalText
+        return finalText.replace(
-            .replace(
             createRegExp(
+                exactly(
                     exactly(`@${username}`)
                         .notBefore(anyOf(letter, digit, charIn("@")))
                         .notAfter(anyOf(letter, digit, charIn("@"))),
+                ).or(exactly(`@${username}@${baseHost}`)),
                 [global],
             ),
             linkTemplate(`@${username}@${baseHost}`),
-            )
-            .replaceAll(
-                `@${username}@${baseHost}`,
-                linkTemplate(`@${username}@${baseHost}`),
         );
     }, text);
 };

classes/inbox/processor.test.ts

@@ -43,7 +43,6 @@ mock.module("@versia/kit/db", () => ({
     },
     Notification: {
         fromSql: jest.fn(),
-        insert: jest.fn(),
     },
 }));
 
@@ -242,6 +241,7 @@ describe("InboxProcessor", () => {
                 id: "followee-id",
                 data: { isLocked: false },
                 sendFollowAccept: jest.fn(),
+                notify: jest.fn(),
             };
             const mockRelationship = {
                 data: { following: false },