Changes in / [0b7ebbf:63edb0d] in Klonkt

Files:

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

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 —————————————————————————————————————————
@@ -108 +106 @@
   `);
   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); // valideert naar solo | hub | circle
+      setTenancy(req.body.tenancy === 'hub' ? 'hub' : 'solo');
     }
     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) {
@@ -149 +145 @@
 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.
@@ -172 +165 @@
 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);
@@ -227 +216 @@
 app.use('/admin/comments', adminCommentsRoutes);
 app.use('/admin/settings', adminSettingsRoutes);
-app.use('/admin/circle', adminCircleRoutes);
 app.use('/admin', adminRoutes);
 app.use('/prutter', prutterRoutes);
@@ -241 +229 @@
 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() {
-  const v = getSetting('tenancy', 'solo');
-  return v === 'hub' ? 'hub' : v === 'circle' ? 'circle' : 'solo';
+  return getSetting('tenancy', 'solo') === 'hub' ? 'hub' : 'solo';
 }
 
 export function setTenancy(mode) {
-  const m = (mode === 'hub' || mode === 'circle') ? mode : 'solo';
-  setSetting('tenancy', m);
+  setSetting('tenancy', mode === 'hub' ? 'hub' : 'solo');
 }

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>
@@ -87 +80 @@
   </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>