Changeset 355364c in Klonkt

Timestamp:

06/26/2026 09:33:42 AM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

5ceed61

Parents:

d71ed03

Message:

fix(cirkel): migrate ALL circle links, not just status='active'

Old pull-protocol health statuses ('error'/'outdated') are irrelevant now: a
peer that removed /.klonkt/* shows as 'error' but still has a working AP actor.
The active-only filter dropped such links (e.g. sound-fabrics: 5 links -> only 2
migrated). Migrate every non-removed link; bump the run flag to v2 so instances
re-migrate and pick up the previously-skipped ones.

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

Files:

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

scripts/migrate-circles.mjs

@@ -24 +24 @@
     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'
+    WHERE cl.status != 'removed'
   `).all();
 } catch (e) { console.log('no circle_links table — nothing to migrate'); process.exit(0); }

src/services/ActivityPubService.js

@@ -1070 +1070 @@
   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; }
+    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 = 'active'").all(); } catch { /* no legacy table */ }
+    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) {
@@ -1081 +1085 @@
       } catch { /* best-effort per link */ }
     }
-    try { db.prepare('INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)').run('circles_migrated_v1', '1'); } catch { /* ignore */ }
+    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; }