Changeset d71ed03 in Klonkt

Timestamp:

06/26/2026 09:28:16 AM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

355364c

Parents:

1968592

Message:

feat(cirkel): auto-migrate legacy circle_links to auto-boost on boot (once)

A site that updates past the old Cirkels protocol would silently lose its cirkel
(circle_links no longer feed /cirkel, and no auto-boost follows existed yet).
autoMigrateCircles() runs once per instance at startup (guarded by a
circles_migrated_v1 flag, async, best-effort) and converts active circle_links
into AP follows with auto-boost — so sound-fabrics/deno/self-hosters self-heal
without the manual scripts/migrate-circles.mjs step.

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

Location:

src

Files:

• server.js (modified) (2 diffs)
• 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 } from './services/ActivityPubService.js';
+import { apWants, startDeliveryWorker, autoMigrateCircles } 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
 
 // Safety net: guarantee that there is always a primary site (solo/hub/circle).

src/services/ActivityPubService.js

@@ -1054 +1054 @@
 }
 
+// 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.
+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_v1'); } catch { return; }
+    if (done && done.value === '1') return;
+    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 = 'active'").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_v1', '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; }
+}
+
 // Follow a fediverse account by @handle (WebFinger → actor → signed Follow).
 export async function followActor(site, handle, autoBoost = false) {
@@ -1212 +1244 @@
   listOutbox, deliverOutboxDelete,
   webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, getTimeline, sendInteraction,
-  autoBoostCount, getCirkelPosts, getCirkelMembers,
+  autoBoostCount, getCirkelPosts, getCirkelMembers, autoMigrateCircles,
   getNotifications, listBlocks, isBlockedAny, blockTarget, unblock,
   deliverWithRetry, enqueueDelivery, processDeliveryQueue, startDeliveryWorker,