Changeset cc3cf7d in Klonkt

Timestamp:

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

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

6fd0e20

Parents:

eb36688

Message:

FEP-044f: object-level quotes (quoteUrl / _misskey_quote) ook als quote-link serveren

De echte reden dat quotes niet toonden: bijna geen enkele instance zet een quote
als FEP-e232 Link-tag. FEP-044f zegt dat een quote meestal een object-property is
(quote / quoteUrl / quoteUri / _misskey_quote). We keken alleen naar de tag, dus
we vonden 0 quotes (self-heal v9: 0/40 overal).

Nu normaliseren we elke quote-vorm naar één FEP-e232-vormige Link (rel
_misskey_quote) en bewaren die in link_json, naast echte FEP-e232 Link-tags
(gededupliceerd op href). De client-parser markeert rel met "quote" al als
isQuote, dus de chip verschijnt zonder client-wijziging.

Self-heal v9 -> v10 zodat bestaande timeline-rijen opnieuw langs de detectie gaan
(v9 had zich al klaar-gemarkeerd).

Changed files:
src/services/ActivityPubService.js

• extractQuoteUrl(note): leest quote/quoteUrl/quoteUri/_misskey_quote (string of embedded object)
• extractLinkJson(note): FEP-e232 Link-tags + genormaliseerde object-quote, deduped
• inbound Create, outbox-backfill en self-heal gebruiken nu extractLinkJson(note)
• SELFHEAL_VERSION 9 -> 10

test/object-links.test.js

• 3 tests: extractQuoteUrl (4 vormen + embedded), normalisatie naar Link, dedup met echte tag

remarks: 178 tests groen (was 175).

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

Files:

• src/services/ActivityPubService.js (modified) (5 diffs)
• test/object-links.test.js (modified) (2 diffs)

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 */ } } }
+          // FEP-e232 + FEP-044f: keep the note's object-link/quote tags for the same read.
+          { 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 */ } }
         }
@@ -2605 +2605 @@
 }
 
+// FEP-044f quote posts: a quote is usually NOT an FEP-e232 tag but an
+// object-level property. FEP-044f §"how to recognise" lists them all:
+// `quote` (the FEP property, a string or an embedded Link/object), and the
+// de-facto `quoteUrl` (as:), `quoteUri` (fedibird), `_misskey_quote` (misskey).
+// This returns the quoted object's URL from whichever is present.
+export function extractQuoteUrl(note) {
+  if (!note || typeof note !== 'object') return null;
+  const q = note.quote ?? note.quoteUrl ?? note.quoteUri ?? note['_misskey_quote'];
+  if (!q) return null;
+  if (typeof q === 'string') return q || null;
+  if (typeof q === 'object') return (typeof q.id === 'string' && q.id) || (typeof q.href === 'string' && q.href) || null;
+  return null;
+}
+
+// The note's object-link tags for storage: real FEP-e232 Link tags PLUS any
+// FEP-044f object-level quote, normalised to one FEP-e232-shaped Link (rel
+// _misskey_quote) so the client's single object-link path renders them all.
+// Deduped by href. Returns the JSON to store (or null if the note has neither).
+export function extractLinkJson(note) {
+  const links = [];
+  const fromTag = extractObjectLinkTags(note && note.tag);
+  if (fromTag) { try { links.push(...JSON.parse(fromTag)); } catch { /* ignore */ } }
+  const qUrl = extractQuoteUrl(note);
+  if (qUrl && !links.some((l) => l && l.href === qUrl)) {
+    links.push({ type: 'Link', mediaType: 'application/activity+json', href: qUrl,
+      rel: ['https://misskey-hub.net/ns#_misskey_quote'], name: qUrl });
+  }
+  return links.length ? JSON.stringify(links) : null;
+}
+
 // ── Cirkel = posts from the accounts you auto-boost ("feature an artist") ──
 let _abCount, _cirkelPosts, _cirkelMembers;
@@ -2701 +2731 @@
 // 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 = 9; // v9: also re-capture FEP-e232 object-link tags (link_json) onto already-cached posts
+const SELFHEAL_VERSION = 10; // v10: also capture FEP-044f object-level quotes (quote/quoteUrl/quoteUri/_misskey_quote) into link_json
 async function fetchNoteAP(url) {
   try {
@@ -2762 +2792 @@
         // 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 */ } } }
+        // 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 */ } } }
         // 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 */ } }
@@ -2897 +2927 @@
         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)
-        const link = extractObjectLinkTags(note.tag);   // FEP-e232: re-capture object-link tags (v9)
+        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);

test/object-links.test.js

@@ -6 +6 @@
 const dbMod = await import('../src/config/database.js');
 dbMod.initializeDatabase();
-const { extractObjectLinkTags, timelineObjectLinks } = await import('../src/services/ActivityPubService.js');
-const AP = { extractObjectLinkTags, timelineObjectLinks };
+const { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson } = await import('../src/services/ActivityPubService.js');
+const AP = { extractObjectLinkTags, timelineObjectLinks, extractQuoteUrl, extractLinkJson };
 
 test('extractObjectLinkTags keeps AS2-profiled ld+json and activity+json Links; drops plain links and mentions', () => {
@@ -31 +31 @@
   assert.equal(AP.timelineObjectLinks('not json'), undefined);
 });
+
+// FEP-044f: object-level quote properties are the common representation.
+test('extractQuoteUrl reads quote / quoteUrl / quoteUri / _misskey_quote (string or embedded object)', () => {
+  assert.equal(AP.extractQuoteUrl({ quote: 'https://s/objects/9' }), 'https://s/objects/9');
+  assert.equal(AP.extractQuoteUrl({ quoteUrl: 'https://s/q1' }), 'https://s/q1');
+  assert.equal(AP.extractQuoteUrl({ quoteUri: 'https://s/q2' }), 'https://s/q2');
+  assert.equal(AP.extractQuoteUrl({ _misskey_quote: 'https://s/q3' }), 'https://s/q3');
+  assert.equal(AP.extractQuoteUrl({ quote: { type: 'Link', href: 'https://s/q4' } }), 'https://s/q4');
+  assert.equal(AP.extractQuoteUrl({ content: 'no quote' }), null);
+});
+
+test('extractLinkJson normalises an object-level quote into one FEP-e232 Link (rel _misskey_quote)', () => {
+  const json = AP.extractLinkJson({ content: 'nice', quoteUrl: 'https://s/objects/9' });
+  const arr = AP.timelineObjectLinks(json);
+  assert.equal(arr.length, 1);
+  assert.equal(arr[0].href, 'https://s/objects/9');
+  assert.ok(arr[0].rel.some((r) => r.includes('quote')));
+});
+
+test('extractLinkJson merges a real FEP-e232 Link with an object-level quote, deduped by href', () => {
+  const note = {
+    tag: [{ type: 'Link', mediaType: 'application/activity+json', href: 'https://s/objects/9' }],
+    quoteUrl: 'https://s/objects/9',   // same target → not duplicated
+  };
+  const arr = AP.timelineObjectLinks(AP.extractLinkJson(note));
+  assert.equal(arr.length, 1);
+  assert.equal(arr[0].href, 'https://s/objects/9');
+});