Changeset 7e66e7e in Klonkt

Timestamp:

06/27/2026 12:04:44 AM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

ace5a9b

Parents:

0a75356

Message:

feat(fedi): hide the leading @mention in displayed comments

A federated reply carries a leading @user@domain mention (the person replied to).
Strip it for display (Mastodon does the same) so a comment reads 'dope tekening ouwe'
not '@jason@… dope …'. Applied to inbound + outbound reply nodes, the
My-replies list, and the notifications preview. stripLeadingMentions keeps the <p>
wrapper and handles both <a>mention</a> links and plain-text mentions.

File:

• src/services/ActivityPubService.js (modified) (5 diffs)

src/services/ActivityPubService.js

@@ -414 +414 @@
 }
 
+// Drop the leading @mention(s) a federated reply carries (the person being replied to),
+// so a comment reads "dope tekening ouwe" instead of "@jason@jasonhacky.nl dope …".
+// Keeps a leading <p> wrapper; handles mention <a> links and plain-text @user@domain.
+export function stripLeadingMentions(html) {
+  if (!html) return html;
+  let s = String(html);
+  s = s.replace(/^(\s*<p[^>]*>)?\s*(?:<a\b[^>]*>\s*@[^<]+<\/a>[  ]*)+/i, (m, p) => p || '');
+  s = s.replace(/^(\s*<p[^>]*>)?\s*(?:@[\w.-]+(?:@[\w.-]+)?[  ]+)+/i, (m, p) => p || '');
+  return s;
+}
+
 // View-ready threaded view of a post's fediverse activity (inbound replies +
 // our outbound replies, nested), plus like/boost counts.
@@ -434 +445 @@
       noteId: r.object_uri, parent: r.parent_uri || null, mine: false, id: r.id,
       actor_name: r.actor_name, actor_handle: r.actor_handle, actor_url: r.actor_url,
-      actor_icon: r.actor_icon, content: r.content, created_at: r.published || r.created_at,
+      actor_icon: r.actor_icon, content: stripLeadingMentions(r.content), created_at: r.published || r.created_at,
       acted_boost: !!r.acted_boost, acted_like: !!r.acted_like,
       children: [],
@@ -442 +453 @@
     nodes.push({
       noteId: baseClean ? `${baseClean}/ap/notes/${o.id}` : o.id, parent: o.in_reply_to || null,
-      mine: true, outboxId: o.id, content: o.content, created_at: o.created_at,
+      mine: true, outboxId: o.id, content: stripLeadingMentions(o.content), created_at: o.created_at,
       actor_name: siteName, actor_handle: siteHandle, actor_url: siteUrl, actor_icon: siteIcon,
       children: [],
@@ -998 +1009 @@
 // List a site's own outbound fediverse replies (for the manage/delete view).
 export function listOutbox(siteSlug) {
-  return db.prepare('SELECT id, content, to_handle, in_reply_to, created_at FROM ap_outbox WHERE site_slug = ? ORDER BY created_at DESC').all(siteSlug);
+  return db.prepare('SELECT id, content, to_handle, in_reply_to, created_at FROM ap_outbox WHERE site_slug = ? ORDER BY created_at DESC')
+    .all(siteSlug).map((r) => ({ ...r, content: stripLeadingMentions(r.content) }));
 }
 
@@ -1291 +1303 @@
     for (const r of rows) out.push({
       type: r.kind, name: r.actor_name, handle: r.actor_handle, url: r.actor_url,
-      content: r.content, post_slug: r.post_slug, post_title: r.post_title, created_at: r.created_at,
+      content: stripLeadingMentions(r.content), post_slug: r.post_slug, post_title: r.post_title, created_at: r.created_at,
     });
   } catch { /* ignore */ }