Changeset fc229f5 in Klonkt

Timestamp:

07/01/2026 10:20:25 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

e499b71

Parents:

2abd3d2

Message:

fix(fediverse): bracketed mentions/hashtags/URLs link and notify

The mention/hashtag/URL prefix classes required whitespace or '>' before the
token, so "(@user@server)", "(#tag)" and "(​https://…)" federated as plain text —
and a bracketed mention's target was never notified (real-world miss on a reply).
Opening brackets are now valid prefixes. Quote characters are deliberately NOT in
the class: a quote precedes attribute values, which must never match.

• src/services/ActivityPubService.js — prefix class [\s>] → [\s>([{] in linkHashtags, linkUrls, and both mention regexes (scan + per-handle replace).
• test/url-linkify.test.js — bracketed URL + hashtag link; attribute values stay untouched.
• CHANGELOG(.nl/.de).md — under Fixed.

Closes prutfolio-src-ovj.

Co-Authored-By: Claude <noreply@…>

Files:

• .beads/.~issues.jsonl.2006037205 (added)
• CHANGELOG.de.md (modified) (1 diff)
• CHANGELOG.md (modified) (1 diff)
• CHANGELOG.nl.md (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (4 diffs)
• test/url-linkify.test.js (modified) (1 diff)

CHANGELOG.de.md

@@ -40 +40 @@
 
 ### Behoben
+- **Erwähnungen, Hashtags und Links in Klammern funktionieren jetzt.** Eine Erwähnung wie
+  `(@benutzer@server)`, ein `(#hashtag)` oder eine URL in Klammern föderierte als reiner Text —
+  und die erwähnte Person wurde nie benachrichtigt. Sie verlinken (und benachrichtigen) jetzt wie
+  ohne Klammern.
 - **Nackte Webadressen werden im Fediverse zu Links.** Eine einfache URL in einem Beitrag oder einer
   Antwort föderiert jetzt als klickbarer Link statt als reiner Text.

CHANGELOG.md

@@ -35 +35 @@
 
 ### Fixed
+- **Mentions, hashtags and links inside brackets now work.** A mention like `(@user@server)`, a
+  `(#hashtag)` or a bracketed URL federated as plain text — and the mentioned person was never
+  notified. They now link (and notify) like their unbracketed forms.
 - **Plain web addresses become links on the fediverse.** A bare URL typed in a post or reply now
   federates as a clickable link instead of plain text.

CHANGELOG.nl.md

@@ -38 +38 @@
 
 ### Opgelost
+- **Vermeldingen, hashtags en links tussen haakjes werken nu.** Een vermelding als
+  `(@gebruiker@server)`, een `(#hashtag)` of een URL tussen haakjes federeerde als platte tekst —
+  en de genoemde persoon kreeg nooit een melding. Ze linken (en melden) nu net als zonder haakjes.
 - **Kale webadressen worden links op de fediverse.** Een losse URL in een post of reactie federeert
   nu als klikbare link in plaats van platte tekst.

src/services/ActivityPubService.js

@@ -1402 +1402 @@
 // Turn #hashtags in reply text into Mastodon-style hashtag links (clickable + federated).
 function linkHashtags(base, html) {
-  return String(html || '').replace(/(^|[\s>])#([\p{L}\p{M}\p{N}_]+)/gu, (m, pre, tag) =>
+  // Prefix: start / whitespace / '>' / opening bracket — "(#tag" is a tag too. NO quote
+  // chars in this class: a quote precedes attribute values (alt="#…"), which must not match.
+  return String(html || '').replace(/(^|[\s>([{])#([\p{L}\p{M}\p{N}_]+)/gu, (m, pre, tag) =>
     `${pre}<a href="${base}/tag/${encodeURIComponent(tag.toLowerCase())}" class="mention hashtag" rel="tag">#${tag}</a>`);
 }
@@ -1413 +1415 @@
   for (let i = 0; i < parts.length; i++) {
     if (/^<a\b/i.test(parts[i])) continue; // already a link → leave as-is
-    parts[i] = parts[i].replace(/(^|[\s>])(https?:\/\/[^\s<]+?)([.,;:!?)\]»]*)(?=$|[\s<])/g,
+    parts[i] = parts[i].replace(/(^|[\s>([{])(https?:\/\/[^\s<]+?)([.,;:!?)\]»]*)(?=$|[\s<])/g,
       (m, pre, url, trail) => `${pre}<a href="${url.replace(/"/g, '%22')}" rel="nofollow noopener" target="_blank">${url}</a>${trail}`);
   }
@@ -1485 +1487 @@
   const inboxes = [];
   const handles = new Set();
-  const re = /(^|[\s>])@([\p{L}\p{M}\p{N}_.-]+@[\p{L}\p{M}\p{N}.-]+)/gu;
+  // Prefix also allows opening brackets — "(@user@host + me)" is a mention too (real-world
+  // miss: a bracketed mention federated as plain text and its target was never notified).
+  const re = /(^|[\s>([{])@([\p{L}\p{M}\p{N}_.-]+@[\p{L}\p{M}\p{N}.-]+)/gu;
   let m;
   while ((m = re.exec(html || ''))) handles.add(m[2]);
@@ -1498 +1502 @@
     const profileUrl = actorInfo(actor, actorUri).url || actorUri; // human profile page → the link href
     const esc = h.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    out = out.replace(new RegExp('(^|[\\s>])@' + esc + '(?![\\p{L}\\p{M}\\p{N}_.-])', 'gu'),
+    out = out.replace(new RegExp('(^|[\\s>([{])@' + esc + '(?![\\p{L}\\p{M}\\p{N}_.-])', 'gu'),
       (full, pre) => `${pre}<a href="${profileUrl}" class="u-url mention" data-actor="${actorUri}">@${h}</a>`);
   }

test/url-linkify.test.js

@@ -40 +40 @@
 });
 
+test('a URL inside parentheses links, closing paren stays outside', () => {
+  const n = note('<p>site (https://example.com/a) hier</p>');
+  assert.match(n.content, /\(<a href="https:\/\/example\.com\/a"[^>]*>https:\/\/example\.com\/a<\/a>\)/);
+});
+
+test('a hashtag inside parentheses still links; quoted attribute values never match', () => {
+  const n = note('<p>leuk (#jazz) toch</p>');
+  assert.match(n.content, /\(<a [^>]*class="mention hashtag"[^>]*>#jazz<\/a>\)/);
+  // A quote precedes attribute values — the prefix class must NOT include quotes.
+  const n2 = note('<p>plaatje <a href="https://x.example/#frag">link</a></p>');
+  assert.equal((n2.content.match(/<a /g) || []).length, 1, 'href value untouched');
+});
+
 test('attribute values are untouched, standalone URLs still link (image stripped from content)', () => {
   const n = note('<p><img src="https://cdn.example.com/pic.png" alt=""> and https://example.org</p>');