Changeset fb6819d in Klonkt

Timestamp:

06/29/2026 09:59:19 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

f2796d3

Parents:

7475ff3

Message:

fix(federation): make boosts spec-addressable + durable so receivers attribute them

Boosts/likes were fire-and-forget with a fragment activity id and no audience
addressing for the original author, so a multi-user receiver (e.g. WordPress's
ActivityPub plugin) had nothing to route the Announce to and never recorded it,
while Mastodon's boost (which cc's the author) did show.

• src/services/ActivityPubService.js (sendInteraction) — Announce/Undo now cc the original author next to our followers and deliver to the author's PERSONAL inbox, use non-fragment dereferenceable activity ids, and add published (Mastodon parity); delivery now runs through deliverWithRetry (ap_delivery queue + backoff) instead of a single best-effort POST, so a transient hiccup no longer loses the boost

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

File:

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

src/services/ActivityPubService.js

@@ -1500 +1500 @@
   // reblog (matched on actor+object — no record of the original Announce needed).
   const fanout = (kind === 'boost' || kind === 'unboost'); // also goes to our followers
+  const followersCol = `${me}/followers`;
+  // Address the original author in cc so their server (Mastodon, WordPress/ActivityPub, …)
+  // attributes the boost to their post and notifies them — without this, a shared-inbox
+  // receiver has nothing to route the Announce to. Non-fragment activity ids + a `published`
+  // stamp keep us aligned with what Mastodon emits.
+  const audience = authorUri ? [followersCol, authorUri] : [followersCol];
   let act;
   if (kind === 'unboost' || kind === 'unlike') {
@@ -1507 +1513 @@
     act = {
       '@context': 'https://www.w3.org/ns/activitystreams',
-      id: `${me}#undo-${Date.now()}-${rid()}`, type: 'Undo', actor: me,
-      object: { id: `${me}#${inner.toLowerCase()}-${Date.now()}-${rid()}`, type: inner, actor: me, object: targetNoteId },
+      id: `${me}/undo/${Date.now()}-${rid()}`, type: 'Undo', actor: me,
+      object: { id: `${me}/${inner.toLowerCase()}/${Date.now()}-${rid()}`, type: inner, actor: me, object: targetNoteId },
     };
-    if (kind === 'unboost') { act.to = [PUBLIC]; act.cc = [`${me}/followers`]; }
+    if (kind === 'unboost') { act.to = [PUBLIC]; act.cc = audience; }
   } else {
     const type = kind === 'boost' ? 'Announce' : 'Like';
     act = {
       '@context': 'https://www.w3.org/ns/activitystreams',
-      id: `${me}#${type.toLowerCase()}-${Date.now()}-${rid()}`,
+      id: `${me}/${type.toLowerCase()}/${Date.now()}-${rid()}`,
       type, actor: me, object: targetNoteId,
     };
-    if (type === 'Announce') { act.to = [PUBLIC]; act.cc = [`${me}/followers`]; }
+    if (type === 'Announce') { act.published = new Date().toISOString(); act.to = [PUBLIC]; act.cc = audience; }
   }
   const inboxes = new Set();
-  if (authorUri) { const a = await fetchActor(authorUri).catch(() => null); if (a) inboxes.add((a.endpoints && a.endpoints.sharedInbox) || a.inbox); }
+  // Author first, via their PERSONAL inbox (not the shared one) so a multi-user receiver
+  // routes the Announce/Like to the right post unambiguously.
+  if (authorUri) { const a = await fetchActor(authorUri).catch(() => null); if (a) inboxes.add(a.inbox || (a.endpoints && a.endpoints.sharedInbox)); }
   if (fanout) { for (const f of fStmts().list.all(site.slug)) inboxes.add(f.shared_inbox || f.inbox); }
-  let delivered = 0;
-  for (const inbox of [...inboxes].filter(Boolean)) { try { const st = await deliver(inbox, act, `${me}#main-key`, keys.private_pem); if (st >= 200 && st < 300) delivered++; } catch { /* best-effort */ } }
-  console.log('[AP]', kind, site.slug, '→', targetNoteId, 'delivered', delivered);
-  return { ok: true, delivered };
+  // Queue each delivery (immediate attempt + backoff retries on failure via ap_delivery)
+  // instead of a single fire-and-forget POST, so a transient hiccup at the receiver doesn't
+  // silently lose the boost — same durability a new post (deliverCreate) already gets.
+  let queued = 0;
+  for (const inbox of [...inboxes].filter(Boolean)) { deliverWithRetry(site.slug, inbox, act, `${me}#main-key`, keys.private_pem); queued++; }
+  console.log('[AP]', kind, site.slug, '→', targetNoteId, 'queued', queued, 'inbox(es)');
+  return { ok: true, delivered: queued };
 }