Changeset eb36688 in Klonkt

Timestamp:

07/26/2026 08:01:25 AM (6 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

cc3cf7d

Parents:

8f8b40f

Message:

FEP-e232 emit: Klonkt bewaart + serveert object-link (quote) tags op de C2S inbox

De client toonde nog geen quotes omdat Klonkt de Link-tags helemaal niet
doorgaf: de inbox-read serveerde alleen de FEP-9098 Emoji-tags (uit emoji_json),
al het andere werd weggegooid. Nu bewaren we ook de FEP-e232 Link-tags (quotes /
inline object-referenties) en serveren we ze mee, precies gespiegeld op de
emoji-aanpak.

Een Link telt als object-link als de mediaType een AP-object markeert: het
AS2-geprofileerde application/ld+json, of application/activity+json als
gelijkwaardige. Kale hyperlinks (text/html) en Mentions blijven eruit.

De inbox-read combineert nu Emoji- en Link-tags in een enkele tag-array (weg
als de note geen van beide heeft). De self-heal gaat naar v9 zodat bestaande
timeline-rijen de Link-tags eenmalig alsnog oppikken.

Changed files:
src/config/database.js

• ap_timeline.link_json kolom (FEP-e232 object-link tags)

src/services/ActivityPubService.js

• extractObjectLinkTags() + timelineObjectLinks() (spiegel van de emoji-functies)
• link_json opslaan bij inbound Create en bij outbox-backfill
• self-heal v8 -> v9: link_json meenemen (select, change-detect, update)
• timelineObjectLinks in de default-export

src/routes/activitypub.js

• inbox-read serveert Emoji- + Link-tags samen als tag

New file:
test/object-links.test.js

• extractObjectLinkTags houdt AS2-ld+json en activity+json Links, laat text/html en Mention vallen; round-trip via timelineObjectLinks

remarks: 175 tests groen (was 171).

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/config/database.js (modified) (1 diff)
• src/routes/activitypub.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (7 diffs)
• test/object-links.test.js (added)

src/config/database.js

@@ -548 +548 @@
   ensureColumn('ap_timeline', 'cw', 'TEXT');                 // remote content-warning text
   ensureColumn('ap_timeline', 'emoji_json', 'TEXT');         // FEP-9098 custom emoji Emoji tags from the inbound note, served back as `tag`
+  ensureColumn('ap_timeline', 'link_json', 'TEXT');          // FEP-e232 object-link (quote/ref) tags from the inbound note, served back as `tag`
   ensureColumn('ap_timeline', 'reblog_name', 'TEXT');        // a followed account boosted this → "X boosted"
   ensureColumn('ap_timeline', 'reblog_handle', 'TEXT');      //   the booster's @handle

src/routes/activitypub.js

@@ -162 +162 @@
       // client renders their images/audio like own outbox posts.
       attachment: AP.timelineAttachments(t.media_json),
-      // FEP-9098 custom emojis: the note's Emoji tags, so the client can
-      // render :shortcode: as an image instead of literal text.
-      tag: AP.timelineEmojis(t.emoji_json),
+      // The note's preserved tags, so the client can render them: FEP-9098
+      // Emoji tags (:shortcode: → image) and FEP-e232 Link tags (quotes /
+      // inline object references). Combined into one `tag` array; omitted
+      // when the note has neither.
+      tag: (() => {
+        const tags = [...(AP.timelineEmojis(t.emoji_json) || []), ...(AP.timelineObjectLinks(t.link_json) || [])];
+        return tags.length ? tags : undefined;
+      })(),
     },
   }));

src/services/ActivityPubService.js

@@ -1539 +1539 @@
           // FEP-9098: keep the note's custom-emoji tags so the C2S inbox read can serve them.
           { const ej = extractEmojiTags(o.tag); if (ej) { try { db.prepare('UPDATE ap_timeline SET emoji_json = ? WHERE id = ? AND slug = ?').run(ej, o.id, s.slug); } catch { /* ignore */ } } }
+          // FEP-e232: keep the note's object-link (quote/ref) tags for the same read.
+          { const lj = extractObjectLinkTags(o.tag); if (lj) { try { db.prepare('UPDATE ap_timeline SET link_json = ? WHERE id = ? AND slug = ?').run(lj, o.id, s.slug); } catch { /* ignore */ } } }
           if (poll) { try { db.prepare('UPDATE ap_timeline SET poll_json = ? WHERE id = ? AND slug = ?').run(JSON.stringify(poll), o.id, s.slug); } catch { /* ignore */ } }
         }
@@ -2582 +2584 @@
 }
 
+// FEP-e232 object links (quotes / inline references). Inbound: keep the note's
+// Link tags whose mediaType marks an AP object (the AS2-profiled ld+json, or
+// activity+json as its equivalent) as JSON, so the C2S inbox read can serve
+// them back and a client (Shaer) can render the quote/reference. Mirrors
+// extractEmojiTags. Plain hyperlinks (text/html) and Mentions are dropped.
+export function extractObjectLinkTags(tag) {
+  const arr = Array.isArray(tag) ? tag : (tag ? [tag] : []);
+  const links = arr.filter((t) => {
+    if (!t || (Array.isArray(t.type) ? t.type[0] : t.type) !== 'Link') return false;
+    if (typeof t.href !== 'string' || !t.href) return false;
+    const mt = String(t.mediaType || '').toLowerCase();
+    return (mt.startsWith('application/ld+json') && mt.includes('activitystreams'))
+      || mt.startsWith('application/activity+json');
+  });
+  return links.length ? JSON.stringify(links) : null;
+}
+export function timelineObjectLinks(linkJson) {
+  try { const arr = linkJson ? JSON.parse(linkJson) : null; return (Array.isArray(arr) && arr.length) ? arr : undefined; }
+  catch { return undefined; }
+}
+
 // ── Cirkel = posts from the accounts you auto-boost ("feature an artist") ──
 let _abCount, _cirkelPosts, _cirkelMembers;
@@ -2678 +2701 @@
 // during a flux window, e.g. a fleet-wide update), and drops notes that are gone
 // (404/410). Bump SELFHEAL_VERSION only on a release that warrants a re-sync.
-const SELFHEAL_VERSION = 8; // v8: also re-capture FEP-9098 custom-emoji tags (emoji_json) onto already-cached posts
+const SELFHEAL_VERSION = 9; // v9: also re-capture FEP-e232 object-link tags (link_json) onto already-cached posts
 async function fetchNoteAP(url) {
   try {
@@ -2739 +2762 @@
         // FEP-9098: keep custom-emoji tags from backfilled posts too.
         { const ej = extractEmojiTags(o.tag); if (ej) { try { db.prepare('UPDATE ap_timeline SET emoji_json = ? WHERE id = ? AND slug = ?').run(ej, o.id, slug); } catch { /* ignore */ } } }
+        // FEP-e232: keep object-link (quote/ref) tags from backfilled posts too.
+        { const lj = extractObjectLinkTags(o.tag); if (lj) { try { db.prepare('UPDATE ap_timeline SET link_json = ? WHERE id = ? AND slug = ?').run(lj, o.id, slug); } catch { /* ignore */ } } }
         // Set poll_json if this is a poll and we don't already have it (COALESCE preserves a vote).
         if (poll) { try { db.prepare('UPDATE ap_timeline SET poll_json = COALESCE(poll_json, ?) WHERE id = ? AND slug = ?').run(JSON.stringify(poll), o.id, slug); } catch { /* ignore */ } }
@@ -2859 +2884 @@
     if (cur >= SELFHEAL_VERSION) return; // already healed for this version — skip on normal boots
     let rows = [];
-    try { rows = db.prepare('SELECT id, content, media_json, nsfw, cw, url, emoji_json FROM ap_timeline ORDER BY rowid DESC LIMIT 200').all(); } catch { /* no table */ }
+    try { rows = db.prepare('SELECT id, content, media_json, nsfw, cw, url, emoji_json, link_json FROM ap_timeline ORDER BY rowid DESC LIMIT 200').all(); } catch { /* no table */ }
     let healed = 0, failed = 0;
     for (const r of rows) {
@@ -2872 +2897 @@
         const url = note.url || null;          // re-sync the human url (catches a remote slug rename)
         const emoji = extractEmojiTags(note.tag);   // FEP-9098: re-capture custom-emoji tags (v8)
-        if ((html && html !== r.content) || media !== (r.media_json || '[]') || nsfw !== (r.nsfw || 0) || (cw || '') !== (r.cw || '') || (url && url !== r.url) || (emoji || '') !== (r.emoji_json || '')) {
-          db.prepare('UPDATE ap_timeline SET content = ?, media_json = ?, nsfw = ?, cw = ?, url = COALESCE(?, url), emoji_json = ? WHERE id = ?').run(html || r.content, media, nsfw, cw, url, emoji, r.id);
+        const link = extractObjectLinkTags(note.tag);   // FEP-e232: re-capture object-link tags (v9)
+        if ((html && html !== r.content) || media !== (r.media_json || '[]') || nsfw !== (r.nsfw || 0) || (cw || '') !== (r.cw || '') || (url && url !== r.url) || (emoji || '') !== (r.emoji_json || '') || (link || '') !== (r.link_json || '')) {
+          db.prepare('UPDATE ap_timeline SET content = ?, media_json = ?, nsfw = ?, cw = ?, url = COALESCE(?, url), emoji_json = ?, link_json = ? WHERE id = ?').run(html || r.content, media, nsfw, cw, url, emoji, link, r.id);
           healed++;
         }
@@ -3377 +3403 @@
   getInteractions, getInteractionById, setInteractionBoosted, setInteractionLiked, setMyReaction, getMyReactions, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote,
   listOutbox, deliverOutboxDelete, deliverOutboxUpdate, deliverDirectNote,
-  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, sendInteraction, voteOnPoll, voteOnRemotePoll,
+  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, timelineObjectLinks, sendInteraction, voteOnPoll, voteOnRemotePoll,
   acceptGatedFollow, rejectGatedFollow, isWardGuardian, sendFollowDecision,
   parseOwnPoll, pollTally, ownPollView, deliverPollUpdate, maybeCrawlThread, sendReport, localMentionSlugs,