From dd8ab851f2d2a06e50c24466660668b0376abbb3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 25 Apr 2023 11:45:13 -0600
Subject: [PATCH] Less restrictive for subject capture...again

---
 core/activitypub/note.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/activitypub/note.js b/core/activitypub/note.js
index d83c30ab..cb751528 100644
--- a/core/activitypub/note.js
+++ b/core/activitypub/note.js
@@ -405,7 +405,7 @@ module.exports = class Note extends ActivityPubObject {
         //    or 32 characters in length, whichever comes first
         //  - If not end of string, we'll sub in '...'
         //
-        let subject = message.message.replace(/^@[^ ]+ /, '').trim();
+        let subject = message.message.replace(/^@[^ ,]+ /, '').trim();
         const m = /^(.+)\r?\n/.exec(subject);
         if (m && m[1]) {
             subject = m[1];
@@ -423,7 +423,7 @@ module.exports = class Note extends ActivityPubObject {
             return;
         }
 
-        const m = /^(@[^ ]+) ./.exec(message.message);
+        const m = /^(@[^ ,]+) ./.exec(message.message);
         if (m && m[1]) {
             message.toUserName = m[1];
         }