Changeset 55bba23 in Klonkt

Timestamp:

06/25/2026 09:13:53 AM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

4b5223f

Parents:

f9f3312

Message:

fediverse: federate pin order via Add/Remove activities (reliable, push-based)

The featured COLLECTION is pull-based and Mastodon caches it with sticky StatusPins, so
reordering never propagated. Mastodon federates pins via Add/Remove activities to the
featured collection (Add -> StatusPin.create, Remove -> destroy), processed immediately.
resyncFeaturedPins removes every pin then re-adds in rank-DESC order (rank 1 last =
newest = shown first) with gaps. /save fires it on any pin/unpin/reorder. Replaces the
unreliable deliverActorUpdate(featured-refetch) approach.

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

Location:

src

Files:

• routes/posts.js (modified) (1 diff)
• services/ActivityPubService.js (modified) (2 diffs)

src/routes/posts.js

@@ -367 +367 @@
   }
 
-  // Pin/unpin changed → push an actor Update so Mastodon re-fetches the featured
-  // (pinned) collection promptly instead of waiting for its own actor refresh.
+  // Pin/unpin/reorder → push Add/Remove activities so followers' instances update the
+  // pinned order immediately (reliable, unlike re-fetching the cached featured collection).
   if ((post.pinned || 0) !== parsePinnedRank(pinned)) {
-    ActivityPubService.deliverActorUpdate(site).catch(() => { /* best-effort */ });
+    const unpinned = (post.pinned || 0) > 0 && parsePinnedRank(pinned) === 0 ? [post.id] : [];
+    ActivityPubService.resyncFeaturedPins(site, unpinned).catch(() => { /* best-effort */ });
   }
 

src/services/ActivityPubService.js

@@ -706 +706 @@
   };
   for (const inbox of inboxes) deliverWithRetry(site.slug, inbox, update, `${me}#main-key`, keys.private_pem);
+}
+
+// Reliably set the pinned order on followers' instances via Add/Remove activities
+// (how Mastodon itself federates pins) — pushed to the inbox + processed immediately,
+// unlike the featured COLLECTION which Mastodon caches with sticky StatusPins.
+// Mastodon's Add skips an already-pinned status, so we REMOVE every pin first, wait,
+// then ADD in rank-DESCENDING order (rank 1 added LAST → newest StatusPin → shown first,
+// because Mastodon displays pins newest-first). `alsoRemove` = ids to unpin too.
+export async function resyncFeaturedPins(site, alsoRemove = []) {
+  const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
+  if (!base || !site || !site.slug) return;
+  const followers = fStmts().list.all(site.slug);
+  if (!followers.length) return;
+  const inboxes = [...new Set(followers.map((f) => f.shared_inbox || f.inbox).filter(Boolean))];
+  const keys = getOrCreateKeys(site.slug);
+  const me = actorId(base, site.slug);
+  const keyId = `${me}#main-key`;
+  const featured = `${me}/featured`;
+  const AS = 'https://www.w3.org/ns/activitystreams';
+  const note = (id) => noteId(base, id);
+  const pinned = db.prepare(
+    `SELECT id FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
+       AND pinned IS NOT NULL AND pinned > 0
+     ORDER BY pinned DESC, COALESCE(published_at, created_at) ASC LIMIT 20`
+  ).all(site.id);
+  const removeIds = [...new Set([...pinned.map((p) => p.id), ...alsoRemove])];
+  // 1. Remove every current pin so Mastodon can recreate them in order.
+  for (const id of removeIds) {
+    const rm = { '@context': AS, id: `${me}#rm-${id}-${Date.now()}`, type: 'Remove', actor: me, object: note(id), target: featured, to: [PUBLIC] };
+    for (const inbox of inboxes) deliver(inbox, rm, keyId, keys.private_pem).catch(() => { /* best-effort */ });
+  }
+  if (!pinned.length) { console.log('[AP] unpinned all featured for', site.slug); return; }
+  await new Promise((r) => setTimeout(r, 5000)); // let the Removes land first
+  // 2. Add in rank-DESC order, gaps so each StatusPin gets an increasing created_at.
+  for (const p of pinned) {
+    const add = { '@context': AS, id: `${me}#add-${p.id}-${Date.now()}`, type: 'Add', actor: me, object: note(p.id), target: featured, to: [PUBLIC], cc: [`${me}/followers`] };
+    for (const inbox of inboxes) deliver(inbox, add, keyId, keys.private_pem).catch(() => { /* best-effort */ });
+    await new Promise((r) => setTimeout(r, 2000));
+  }
+  console.log('[AP] resynced', pinned.length, 'featured pins for', site.slug);
 }
 
@@ -1038 +1078 @@
   getOrCreateKeys, apWants, sendAP, actorId, noteId,
   buildActor, buildNote, buildCreate, buildOutbox, buildFollowers, buildFeatured,
-  followerCount, deliver, fetchActor, verifyRequest, handleInbox, deliverCreate, deliverDelete, deliverUpdate, deliverActorUpdate,
+  followerCount, deliver, fetchActor, verifyRequest, handleInbox, deliverCreate, deliverDelete, deliverUpdate, deliverActorUpdate, resyncFeaturedPins,
   getInteractions, getInteractionById, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote,
   listOutbox, deliverOutboxDelete,