Changeset 6fd0e20 in Klonkt

Timestamp:

07/26/2026 08:20:58 AM (6 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

af6e085

Parents:

cc3cf7d

Message:

FEP-044f: Klonkt resolvet de geciteerde post voor een ingebedde quote-kaart

De client kan remote AP-objecten niet gesigneerd ophalen, dus Klonkt resolvet de
quote emit-side tot een compacte, gesaneerde snapshot en serveert die als
shaer:quote op de C2S inbox-read. De client rendert daarmee een geneste kaart
(auteur + avatar + tekst + evt. thumbnail) i.p.v. alleen de link-chip.

resolveQuote(note) haalt de quoted post op (SSRF-safe apGetJson), pakt de auteur
(fetchActor + actorInfo) en saneert de content met dezelfde sanitizer als elke
andere note (kindveilig blijft gelden). Best-effort: faalt de fetch, dan blijft
quote_json leeg en valt de client terug op de chip.

Bron-URL via quoteHrefOf: object-level quote (FEP-044f) of een quote-rel
FEP-e232 Link. Resolutie op inbound (fire-and-forget, blokkeert de inbox-response
niet), op outbox-backfill (await) en in self-heal (v10 -> v11, met COALESCE-gedrag
zodat een tijdelijk onbereikbare quoted post de cache niet leegt).

Changed files:
src/config/database.js

• ap_timeline.quote_json kolom

src/services/ActivityPubService.js

• quoteHrefOf(note): quoted-post-URL uit object-quote of quote-rel Link
• resolveQuote(note): async snapshot {url, author, content, published, media}
• timelineQuote(quoteJson): snapshot terug voor de inbox-read
• inbound (fire-and-forget), backfill (await), self-heal v11 (await + COALESCE)
• timelineQuote in de default-export

src/routes/activitypub.js

• inbox-read serveert shaer:quote (de geresolvede snapshot)

test/object-links.test.js

• quoteHrefOf (object-quote + quote-rel Link + geen) en timelineQuote round-trip

remarks: 180 tests groen (was 178). resolveQuote zelf is netwerk, niet in de unit-test.

-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) (8 diffs)
• test/object-links.test.js (modified) (2 diffs)

src/config/database.js

@@ -549 +549 @@
   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', 'quote_json', 'TEXT');         // FEP-044f resolved quoted-post snapshot (author + content), for the embedded quote card
   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

@@ -170 +170 @@
         return tags.length ? tags : undefined;
       })(),
+      // FEP-044f: the resolved quoted post (author + content), so the client
+      // renders an embedded quote card instead of a bare link. Omitted when the
+      // note has no quote or the quoted post could not be resolved.
+      'shaer:quote': AP.timelineQuote(t.quote_json),
     },
   }));

src/services/ActivityPubService.js

@@ -1542 +1542 @@
           { const lj = extractLinkJson(o); 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 */ } }
+        }
+        // FEP-044f embedded quote card: resolve the quoted post out of band so
+        // the inbox response is not blocked on a remote fetch. Best-effort.
+        if (quoteHrefOf(o)) {
+          const slugs = subs.map((s) => s.slug);
+          resolveQuote(o).then((qj) => {
+            if (!qj) return;
+            for (const sl of slugs) { try { db.prepare('UPDATE ap_timeline SET quote_json = ? WHERE id = ? AND slug = ?').run(qj, o.id, sl); } catch { /* ignore */ } }
+          }).catch(() => { /* best-effort */ });
         }
         console.log('[AP] timeline +', actorUri, 'x' + subs.length);
@@ -2635 +2644 @@
 }
 
+// The URL of the quoted post, from either an object-level quote (FEP-044f) or a
+// quote-rel FEP-e232 Link tag. Used to resolve the embedded quote card.
+export function quoteHrefOf(note) {
+  const direct = extractQuoteUrl(note);
+  if (direct) return direct;
+  const arr = Array.isArray(note && note.tag) ? note.tag : (note && note.tag ? [note.tag] : []);
+  for (const t of arr) {
+    if (!t || (Array.isArray(t.type) ? t.type[0] : t.type) !== 'Link' || typeof t.href !== 'string') continue;
+    const rel = Array.isArray(t.rel) ? t.rel : (t.rel ? [t.rel] : []);
+    if (rel.some((r) => /quote/i.test(String(r)))) return t.href;
+  }
+  return null;
+}
+
+// Turn the stored quote snapshot back into the object the C2S inbox read serves
+// as `shaer:quote`, so the client can render the embedded quote card.
+export function timelineQuote(quoteJson) {
+  try { const q = quoteJson ? JSON.parse(quoteJson) : null; return (q && typeof q === 'object') ? q : undefined; }
+  catch { return undefined; }
+}
+
 // ── Cirkel = posts from the accounts you auto-boost ("feature an artist") ──
 let _abCount, _cirkelPosts, _cirkelMembers;
@@ -2731 +2761 @@
 // 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 = 10; // v10: also capture FEP-044f object-level quotes (quote/quoteUrl/quoteUri/_misskey_quote) into link_json
+const SELFHEAL_VERSION = 11; // v11: also resolve the FEP-044f embedded quote card (quote_json) onto already-cached posts
 async function fetchNoteAP(url) {
   try {
@@ -2748 +2778 @@
   }
   return JSON.stringify(atts);
+}
+
+// FEP-044f embedded quote card: resolve the quoted post to a compact, sanitised
+// snapshot { url, author{name,handle,icon}, content, published, media } so the
+// client can render it as a nested card instead of a bare link. Best-effort and
+// SSRF-safe (apGetJson): returns null on any failure, and the client falls back
+// to the object-link chip. The content goes through the same sanitiser as every
+// other note, so the kid-safe guarantees hold.
+async function resolveQuote(note) {
+  const url = quoteHrefOf(note);
+  if (!url) return null;
+  const q = await apGetJson(url);
+  if (!q || typeof q !== 'object') return null;
+  const authorUri = typeof q.attributedTo === 'string' ? q.attributedTo
+    : (q.attributedTo && typeof q.attributedTo.id === 'string' ? q.attributedTo.id : null);
+  const ai = authorUri ? actorInfo(await fetchActor(authorUri), authorUri) : null;
+  const snapshot = {
+    url: safeUrl(q.url || q.id || url) || url,
+    author: ai ? { name: ai.name, handle: ai.handle, icon: ai.icon } : null,
+    content: HtmlSanitizerService.sanitize(q.content || ''),
+    published: q.published || null,
+    media: mediaFromNote(q),
+  };
+  return JSON.stringify(snapshot);
 }
 // A generic SSRF-safe AP GET (collections / pages).
@@ -2794 +2848 @@
         // FEP-e232 + FEP-044f: keep object-link/quote tags from backfilled posts too.
         { const lj = extractLinkJson(o); if (lj) { try { db.prepare('UPDATE ap_timeline SET link_json = ? WHERE id = ? AND slug = ?').run(lj, o.id, slug); } catch { /* ignore */ } } }
+        // FEP-044f: resolve the embedded quote card for backfilled posts too.
+        if (quoteHrefOf(o)) { const qj = await resolveQuote(o); if (qj) { try { db.prepare('UPDATE ap_timeline SET quote_json = ? WHERE id = ? AND slug = ?').run(qj, 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 */ } }
@@ -2914 +2970 @@
     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, link_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, quote_json FROM ap_timeline ORDER BY rowid DESC LIMIT 200').all(); } catch { /* no table */ }
     let healed = 0, failed = 0;
     for (const r of rows) {
@@ -2928 +2984 @@
         const emoji = extractEmojiTags(note.tag);   // FEP-9098: re-capture custom-emoji tags (v8)
         const link = extractLinkJson(note);   // FEP-e232 + FEP-044f: re-capture object-link/quote 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);
+        // FEP-044f: resolve the embedded quote card (v11). COALESCE-style: keep a
+        // cached snapshot if the quoted post is momentarily unreachable now.
+        const quote = quoteHrefOf(note) ? (await resolveQuote(note)) || r.quote_json || null : null;
+        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 || '') || (quote || '') !== (r.quote_json || '')) {
+          db.prepare('UPDATE ap_timeline SET content = ?, media_json = ?, nsfw = ?, cw = ?, url = COALESCE(?, url), emoji_json = ?, link_json = ?, quote_json = ? WHERE id = ?').run(html || r.content, media, nsfw, cw, url, emoji, link, quote, r.id);
           healed++;
         }
@@ -3433 +3492 @@
   getInteractions, getInteractionById, setInteractionBoosted, setInteractionLiked, setMyReaction, getMyReactions, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote,
   listOutbox, deliverOutboxDelete, deliverOutboxUpdate, deliverDirectNote,
-  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, timelineObjectLinks, sendInteraction, voteOnPoll, voteOnRemotePoll,
+  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, timelineObjectLinks, timelineQuote, sendInteraction, voteOnPoll, voteOnRemotePoll,
   acceptGatedFollow, rejectGatedFollow, isWardGuardian, sendFollowDecision,
   parseOwnPoll, pollTally, ownPollView, deliverPollUpdate, maybeCrawlThread, sendReport, localMentionSlugs,

test/object-links.test.js

@@ -6 +6 @@
 const dbMod = await import('../src/config/database.js');
 dbMod.initializeDatabase();
-const { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson } = await import('../src/services/ActivityPubService.js');
-const AP = { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson };
+const { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson, quoteHrefOf, timelineQuote } = await import('../src/services/ActivityPubService.js');
+const AP = { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson, quoteHrefOf, timelineQuote };
 
 test('extractObjectLinkTags keeps AS2-profiled ld+json and activity+json Links; drops plain links and mentions', () => {
@@ -59 +59 @@
   assert.equal(arr[0].href, 'https://s/objects/9');
 });
+
+// FEP-044f embedded quote card: the quoted-post URL feeds the resolver.
+test('quoteHrefOf reads an object-level quote or a quote-rel FEP-e232 Link', () => {
+  assert.equal(AP.quoteHrefOf({ quoteUrl: 'https://s/q1' }), 'https://s/q1');
+  assert.equal(AP.quoteHrefOf({
+    tag: [{ type: 'Link', href: 'https://s/q2', rel: 'https://misskey-hub.net/ns#_misskey_quote' }],
+  }), 'https://s/q2');
+  assert.equal(AP.quoteHrefOf({ content: 'plain, no quote' }), null);
+  // a plain (non-quote) FEP-e232 reference is not a quote target
+  assert.equal(AP.quoteHrefOf({ tag: [{ type: 'Link', href: 'https://s/ref', rel: 'mention' }] }), null);
+});
+
+test('timelineQuote round-trips the stored snapshot; junk → undefined', () => {
+  const snap = JSON.stringify({ url: 'https://s/q', author: { name: 'A', handle: '@a@s', icon: null }, content: '<p>hi</p>' });
+  const back = AP.timelineQuote(snap);
+  assert.equal(back.url, 'https://s/q');
+  assert.equal(back.author.handle, '@a@s');
+  assert.equal(AP.timelineQuote(null), undefined);
+  assert.equal(AP.timelineQuote('not json'), undefined);
+});