Changeset 4c47eff in Klonkt

Timestamp:

06/26/2026 12:32:50 PM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

bbce8da

Parents:

78b6d8a

Message:

refactor(cirkel): remove the legacy circle auto-migration (no auto-fediverse)

autoMigrateCircles auto-sent Follows on boot to re-establish legacy circle_links
as AP follows. That violates the rule 'the code never throws anything into the
fediverse automatically' — at scale it would surprise-Follow on behalf of operators
who never asked. Removed the boot call, the function, its export, and the manual
scripts/migrate-circles.mjs (bulk Follows). resolveApActor stays (used by bare-domain
follows). Dead circle_links table is left as harmless dead data; an operator restores
an old cirkel by re-following in /volgend (their own click). We can do this clean
removal now precisely because we're still small-scale.

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

Files:

• scripts/migrate-circles.mjs (deleted)
• src/server.js (modified) (2 diffs)
• src/services/ActivityPubService.js (modified) (2 diffs)

src/server.js

@@ -58 +58 @@
 import ogRoutes from './routes/og.js';
 import apRoutes from './routes/activitypub.js';
-import { apWants, startDeliveryWorker, autoMigrateCircles, selfHealTimeline } from './services/ActivityPubService.js';
+import { apWants, startDeliveryWorker, selfHealTimeline } from './services/ActivityPubService.js';
 
 // SESSION_SECRET: use the env var if set. Otherwise auto-generate a strong one
@@ -161 +161 @@
 startScheduler(); // release planning: publish scheduled posts when publish_at is reached
 startDeliveryWorker(); // retry failed fediverse deliveries with backoff
-autoMigrateCircles(); // one-time: convert legacy circle_links -> AP auto-boost follows
 selfHealTimeline(); // once per SELFHEAL_VERSION bump: re-sync the fediverse cache (covers/edits) after a drastic update
 

src/services/ActivityPubService.js

@@ -1084 +1084 @@
 }
 
-// One-time, best-effort migration of the old Cirkels (pull-protocol circle_links)
-// into ActivityPub follows with auto-boost. Runs once per instance at boot so a
-// site that updates past the old protocol keeps its cirkel without a manual step.
+// Resolve a Klonkt/AP actor URL from a site root: a Klonkt site's root 302s to
+// /ap/users/<slug> (content negotiation; Location may be relative). Used by
+// followActor for bare-domain follows.
+// NB: the old auto-migration of legacy Cirkels (circle_links -> AP follows) was
+// REMOVED on 2026-06-26 — it auto-sent Follows on boot, which violates "the code
+// never throws anything into the fediverse automatically" (would surprise-Follow
+// for some operators at scale). The dead circle_links table stays as harmless dead
+// data; an operator restores an old cirkel by re-following in /volgend (their click).
 async function resolveApActor(siteUrl) {
   try {
     const r = await fetch(siteUrl, { headers: { Accept: 'application/activity+json' }, redirect: 'manual' });
-    // A Klonkt site's root 302s to /ap/users/<slug> (Location may be relative).
     if (r.status >= 300 && r.status < 400) { const loc = r.headers.get('location'); if (loc) return new URL(loc, siteUrl).href; }
     if (r.ok) return siteUrl;
   } catch { /* unreachable */ }
   return null;
-}
-let _circlesMigrating = false;
-export async function autoMigrateCircles() {
-  if (_circlesMigrating) return; _circlesMigrating = true;
-  try {
-    let done; try { done = db.prepare('SELECT value FROM app_settings WHERE key = ?').get('circles_migrated_v2'); } catch { return; }
-    if (done && done.value === '1') return;
-    // Migrate EVERY link the user added (not only status='active'): the old
-    // 'error'/'outdated' statuses came from the pull-protocol's health checks
-    // (now irrelevant) — e.g. a peer that removed /.klonkt/* shows up as error
-    // but still has a working AP actor.
-    let links = [];
-    try { links = db.prepare("SELECT cl.remote_url AS url, s.id AS sid, s.slug AS slug FROM circle_links cl JOIN sites s ON s.id = cl.local_site_id WHERE cl.status != 'removed'").all(); } catch { /* no legacy table */ }
-    let ok = 0;
-    for (const l of links) {
-      try {
-        const actor = await resolveApActor(l.url);
-        if (actor) { const r = await followActor({ id: l.sid, slug: l.slug }, actor, true); if (!(r && r.error)) ok++; }
-      } catch { /* best-effort per link */ }
-    }
-    try { db.prepare('INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)').run('circles_migrated_v2', '1'); } catch { /* ignore */ }
-    if (links.length) console.log(`[AP] circle migration: ${ok}/${links.length} legacy link(s) -> auto-boost`);
-  } catch { /* never block boot */ } finally { _circlesMigrating = false; }
 }
 
@@ -1371 +1352 @@
   listOutbox, deliverOutboxDelete,
   webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, getTimeline, sendInteraction,
-  autoBoostCount, boostedCount, markBoosted, unmarkBoosted, getCirkelPosts, getCirkelMembers, autoMigrateCircles, selfHealTimeline, boostLatestN,
+  autoBoostCount, boostedCount, markBoosted, unmarkBoosted, getCirkelPosts, getCirkelMembers, selfHealTimeline, boostLatestN,
   getNotifications, listBlocks, isBlockedAny, blockTarget, unblock,
   deliverWithRetry, enqueueDelivery, processDeliveryQueue, startDeliveryWorker,