Changeset 2e62848 in Klonkt

Timestamp:

06/28/2026 10:07:38 AM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

37a297d

Parents:

907a013

Message:

fix(fedi): post tags federate as visible hashtags (+ CamelCase for spaces)

• services/ActivityPubService.js — buildNote now (a) normalises post.tags whether it arrives as an array, a JSON string, or a comma string (it was a JSON string at federation → the old Array.isArray check silently dropped the whole tags field), and (b) appends the tags-field hashtags to the Note content as rel="tag" links so Mastodon renders them (a Hashtag only in the tag array isn't shown inline). Multi-word tags become CamelCase (#LiveMusic) for display; the slug/href stays lowercase. Deduped against hashtags already inline in the body.

File:

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

src/services/ActivityPubService.js

@@ -229 +229 @@
   body = body.replace(/\r?\n/g, '<br>');
   body = linkHashtags(base, body); // link inline #hashtags in the post body too
+  // Append the tags-field hashtags to the content so Mastodon renders them as clickable
+  // hashtags (a Hashtag that's only in the `tag` array isn't shown inline). CamelCase
+  // multi-word tags; skip any already present inline in the body.
+  {
+    const inlineTags = new Set(hashtagTags(base, body).map((h) => h.name.slice(1).toLowerCase()));
+    const addSeen = new Set();
+    const tagLinks = normalizeTags(post.tags).map(tagParts).filter(Boolean)
+      .filter((p) => !inlineTags.has(p.slug) && !addSeen.has(p.slug) && addSeen.add(p.slug))
+      .map((p) => `<a href="${base}/tag/${encodeURIComponent(p.slug)}" class="mention hashtag" rel="tag">#${p.label}</a>`);
+    if (tagLinks.length) body += `<p>${tagLinks.join(' ')}</p>`;
+  }
   const seen = new Set();
   const attachment = urls.filter(Boolean)
@@ -915 +926 @@
 }
 
+// Normalise a post's tags field (array, JSON-string, or comma-string) to an array.
+function normalizeTags(t) {
+  if (Array.isArray(t)) return t;
+  if (typeof t === 'string') {
+    const s = t.trim(); if (!s) return [];
+    if (s[0] === '[') { try { const a = JSON.parse(s); return Array.isArray(a) ? a : []; } catch { /* fall through */ } }
+    return s.split(',').map((x) => x.trim()).filter(Boolean);
+  }
+  return [];
+}
+// A tag → { label, slug }. Multi-word tags become CamelCase (#LiveMusic) for the display
+// name (Mastodon hashtags can't contain spaces; CamelCase is the accessibility norm); the
+// slug/href stays lowercase ("livemusic").
+function tagParts(raw) {
+  const words = String(raw || '').trim().split(/[\s_]+/).map((w) => w.replace(/[^A-Za-z0-9]/g, '')).filter(Boolean);
+  if (!words.length) return null;
+  const slug = words.join('').toLowerCase();
+  if (!slug) return null;
+  const label = words.length > 1 ? words.map((w) => w[0].toUpperCase() + w.slice(1)).join('') : words[0];
+  return { label, slug };
+}
 // Merge a post's tags field + the #hashtags linked inline in its body into one deduped
 // Hashtag tag list (with hrefs to our /tag page).
 function buildHashtagList(base, tagsField, content) {
   const out = [], seen = new Set();
-  for (const t of (Array.isArray(tagsField) ? tagsField : [])) {
-    const name = String(t).replace(/\s+/g, ''); if (!name) continue;
-    const k = name.toLowerCase(); if (seen.has(k)) continue; seen.add(k);
-    out.push({ type: 'Hashtag', href: `${base}/tag/${encodeURIComponent(k)}`, name: '#' + name });
+  for (const t of normalizeTags(tagsField)) {
+    const p = tagParts(t); if (!p || seen.has(p.slug)) continue; seen.add(p.slug);
+    out.push({ type: 'Hashtag', href: `${base}/tag/${encodeURIComponent(p.slug)}`, name: '#' + p.label });
   }
   for (const h of hashtagTags(base, content)) {