Changeset 0b7ebbf in Klonkt

Timestamp:

06/16/2026 01:12:00 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

57929aa

Parents:

63edb0d (diff), efdde37 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'feat/cirkels-v1'

# Conflicts:
# src/routes/admin-settings.js

Files:

• docs/cirkels-v1-spec.md (added)
• src/config/database.js (modified) (2 diffs)
• src/routes/admin-circle.js (added)
• src/routes/admin-settings.js (modified) (1 diff)
• src/routes/circle.js (added)
• src/routes/federation.js (added)
• src/server.js (modified) (5 diffs)
• src/services/CircleFederation.js (added)
• src/services/CircleService.js (added)
• src/services/SettingsService.js (modified) (1 diff)
• src/views/pages/admin-circle.ejs (added)
• src/views/pages/admin-settings.ejs (modified) (2 diffs)
• src/views/pages/circle-feed.ejs (added)

src/config/database.js

@@ -47 +47 @@
   // Per-site Prutter toggle: when off, DM endpoints/UI are hidden for that site.
   ensureColumn('sites', 'enable_prutter', 'INTEGER DEFAULT 1');
+  // Cirkels: mag deze site in cirkels van anderen verschijnen (surfacing opt-out).
+  ensureColumn('sites', 'allow_circle', 'INTEGER DEFAULT 1');
 
   // v9 audit additions —————————————————————————————————————————
@@ -106 +108 @@
   `);
   db.prepare("INSERT OR IGNORE INTO app_settings (key, value) VALUES ('tenancy', 'solo')").run();
+
+  // ── Cirkels (federatie) ─────────────────────────────────────
+  // Decentrale, asymmetrische verbindingen tussen solo-instances.
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS circle_links (
+      id TEXT PRIMARY KEY,
+      local_site_id TEXT NOT NULL,
+      remote_url TEXT NOT NULL,
+      remote_actor_id TEXT,
+      label TEXT,
+      status TEXT DEFAULT 'active',
+      added_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      last_synced DATETIME,
+      last_error TEXT,
+      UNIQUE(local_site_id, remote_url),
+      FOREIGN KEY (local_site_id) REFERENCES sites(id)
+    );
+    CREATE TABLE IF NOT EXISTS remote_actors (
+      id TEXT PRIMARY KEY,
+      url TEXT UNIQUE NOT NULL,
+      name TEXT,
+      summary TEXT,
+      avatar TEXT,
+      public_key TEXT NOT NULL,
+      fetched_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    );
+    CREATE TABLE IF NOT EXISTS remote_posts (
+      id TEXT PRIMARY KEY,
+      actor_id TEXT NOT NULL,
+      published DATETIME,
+      title TEXT,
+      summary TEXT,
+      url TEXT,
+      media_json TEXT,
+      raw_json TEXT,
+      fetched_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+      FOREIGN KEY (actor_id) REFERENCES remote_actors(id)
+    );
+  `);
 }
 

src/routes/admin-settings.js

@@ -88 +88 @@
 
     if (typeof req.body.tenancy !== 'undefined') {
-      setTenancy(req.body.tenancy === 'hub' ? 'hub' : 'solo');
+      setTenancy(req.body.tenancy); // valideert naar solo | hub | circle
     }
     if (typeof req.body.hub_title !== 'undefined') {

src/server.js

@@ -43 +43 @@
 import artistsRoutes from './routes/artists.js';
 import postsRoutes from './routes/posts.js';
+import federationRoutes from './routes/federation.js';
+import { startCircleSyncLoop } from './services/CircleService.js';
+import adminCircleRoutes from './routes/admin-circle.js';
+import circleRoutes from './routes/circle.js';
 
 if (!process.env.SESSION_SECRET) {
@@ -145 +149 @@
 initializeDatabase();
 
+// Cirkels: periodieke achtergrond-sync van remote instances (no-op tenzij tenancy='circle').
+startCircleSyncLoop();
+
 // Bundle HTMX: copy from node_modules into our own assets dir so we can serve
 // it locally (no third-party CDN). Idempotent — only copies if size differs.
@@ -165 +172 @@
 const prutter = new PrutterService(db);
 app.locals.prutter = prutter;
+
+// Cirkels-federatie: publieke, site-agnostische endpoints (/.klonkt/*).
+// Vóór resolveSite/theme — ze hebben geen site-context nodig.
+app.use(federationRoutes);
 
 app.use(resolveSite);
@@ -216 +227 @@
 app.use('/admin/comments', adminCommentsRoutes);
 app.use('/admin/settings', adminSettingsRoutes);
+app.use('/admin/circle', adminCircleRoutes);
 app.use('/admin', adminRoutes);
 app.use('/prutter', prutterRoutes);
@@ -229 +241 @@
 app.get('/artiesten', (req, res) => res.redirect(301, req.originalUrl.replace(/^\/artiesten/, '/leden'))); // oude URL -> /leden
 app.use('/', hubRoutes); // hub-overview op '/' (solo: next() -> postsRoutes)
+app.use('/', circleRoutes); // /cirkel-feed (solo/hub: next() -> postsRoutes)
 app.use('/', postsRoutes);
 

src/services/SettingsService.js

@@ -35 +35 @@
 
 export function getTenancy() {
-  return getSetting('tenancy', 'solo') === 'hub' ? 'hub' : 'solo';
+  const v = getSetting('tenancy', 'solo');
+  return v === 'hub' ? 'hub' : v === 'circle' ? 'circle' : 'solo';
 }
 
 export function setTenancy(mode) {
-  setSetting('tenancy', mode === 'hub' ? 'hub' : 'solo');
+  const m = (mode === 'hub' || mode === 'circle') ? mode : 'solo';
+  setSetting('tenancy', m);
 }

src/views/pages/admin-settings.ejs

@@ -25 +25 @@
           <strong>Hub</strong> — bedrijfssite met <code>/user/</code>.
           <small>Jij (admin) wijst gebruikers een eigen Klonkt Hub toe. Gesloten cirkel: geen open registratie.</small>
+        </span>
+      </label>
+      <label class="set-opt">
+        <input type="radio" name="tenancy" value="circle" <%= tenancy === 'circle' ? 'checked' : '' %>>
+        <span>
+          <strong>Cirkels</strong> &mdash; solo + federatie.
+          <small>E&eacute;n eigen site die de publieke posts van andere Klonkt-sites toont. Asymmetrisch: jij bepaalt wie in jouw cirkel zit.</small>
         </span>
       </label>
@@ -80 +87 @@
   </section>
   <% } %>
+
+  <% if (tenancy === 'circle') { %>
+  <section class="set-card" style="margin-top:1rem">
+    <h2>Cirkel</h2>
+    <p class="set-help">
+      Beheer welke andere Klonkt-sites je in je cirkel toont, en of jouw site in
+      cirkels van anderen mag verschijnen.
+    </p>
+    <p><a href="/admin/circle" class="btn btn-primary">Beheer je cirkel &rarr;</a></p>
+  </section>
+  <% } %>
 </div>