fix: remove the comma after collaped or grouped mentions #2464

elk-zone · Feb 25, 2024 · 1f1ce20 · 1f1ce20
1 parent cadf1b4
commit 1f1ce20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/composables/content-parse.ts b/composables/content-parse.ts
@@ -568,6 +568,11 @@ function transformCollapseMentions(status?: mastodon.v1.Status, inReplyToStatus?
         if (child.type === TEXT_NODE) {
           trimContentStart = () => {
             child.value = child.value.trimStart()
+            // remove the comma after the collapsed mention.
+            if (child.value.at(0) === ',') {
+              child.value = child.value.slice(1)
+              child.value = child.value.trimStart()
+            }
           }
         }
         // remove <br> after mention

diff --git a/composables/users.ts b/composables/users.ts
@@ -126,7 +126,9 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
 
   // GoToSocial only API
   const url = `https://${user.server}`
-  fetch(`${url}/nodeinfo/2.0`).then(r => r.json()).then((info) => {
+  fetch(`${url}/nodeinfo/2.0`, {
+    mode: 'no-cors',
+  }).then(r => r.json()).then((info) => {
     nodes.value[user.server] = info
   }).catch(() => undefined)