Changeset 4c12783 in Klonkt

Timestamp:

06/25/2026 08:52:26 PM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

8ad1784

Parents:

a9900ec

Message:

perf(ap): backfill new followers once per remote instance, not per follower

Backfill fired 20 Create deliveries on every Follow. Mastodon dedupes notes
per-instance, so the 2nd+ follower from the same instance got the same 20 posts
re-sent for nothing (and old posts don't re-enter a new follower's timeline
anyway). Now we skip backfill when another follower already represents that
instance (same shared_inbox), and deliver to the shared inbox when present.

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

File:

• src/services/ActivityPubService.js (modified) (1 diff)

src/services/ActivityPubService.js

@@ -585 +585 @@
     const remote = await fetchActor(who);
     if (!remote || !remote.inbox) return 202; // can't reach them → drop quietly
-    fStmts().ins.run(slug, who, remote.inbox, (remote.endpoints && remote.endpoints.sharedInbox) || null);
+    const sharedInbox = (remote.endpoints && remote.endpoints.sharedInbox) || null;
+    fStmts().ins.run(slug, who, remote.inbox, sharedInbox);
     const me = actorId(base, slug);
     const keys = getOrCreateKeys(slug);
     const accept = { '@context': 'https://www.w3.org/ns/activitystreams', id: `${me}#accept-${Date.now()}-${rid()}`, type: 'Accept', actor: me, object: act };
     deliver(remote.inbox, accept, `${me}#main-key`, keys.private_pem).catch((e) => console.warn('[AP] Accept delivery failed:', e.message));
-    // Auto-backfill: send the new follower our recent posts as Create so their
-    // timeline isn't empty (Mastodon doesn't fetch history on follow). Fire-and-forget.
-    backfillNewFollower(base, slug, remote.inbox).catch(() => { /* best-effort */ });
+    // Auto-backfill: send our recent posts as Create so the instance has our history
+    // (Mastodon doesn't fetch history on follow). ONCE PER REMOTE INSTANCE only —
+    // Mastodon dedupes notes per-instance, so re-filling an instance that already has
+    // a follower of ours is wasted work (and won't re-populate the new follower's
+    // timeline anyway). Deliver to the shared inbox (instance-level) when present.
+    // Sync insert+check (no await between) → no interleave race with concurrent Follows.
+    const instanceFilled = sharedInbox &&
+      db.prepare('SELECT 1 FROM ap_followers WHERE slug = ? AND shared_inbox = ? AND actor_uri != ? LIMIT 1')
+        .get(slug, sharedInbox, who);
+    if (!instanceFilled) {
+      backfillNewFollower(base, slug, sharedInbox || remote.inbox).catch(() => { /* best-effort */ });
+    }
     console.log('[AP] Follow', who, '→', slug, verified ? '(sig ok)' : '(sig unverified)');
     return 202;