Changeset 0091cb7 in Klonkt

Timestamp:

06/16/2026 12:59:24 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

efdde37

Parents:

25d4041

Message:

Circles v1 — steps 4+5: Admin UI + /cirkel feed

• Mode 'Circles' in Admin > Settings (radio + section).
• Admin > Circle (admin-circle): add sources/list/status, per source Refresh (syncOne) + Delete (cleans up orphaned cache), and a visibility toggle (sites.allow_circle, opt-out for surfacing).
• /cirkel feed: cached remote_posts as static cards (source/avatar, title, summary, cover, link to source). Only when tenancy=circle.
• allow_circle column (ensureColumn) + CircleFederation respects it.
• Output escaped everywhere + URL-scheme guards (http/https) against XSS import.

v1 functionally complete (publish + pull + UI + feed). Remaining: hardening/review.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

Location:

src

Files:

• config/database.js (modified) (1 diff)
• routes/admin-circle.js (added)
• routes/admin-settings.js (modified) (1 diff)
• routes/circle.js (added)
• server.js (modified) (3 diffs)
• services/CircleFederation.js (modified) (1 diff)
• views/pages/admin-circle.ejs (added)
• views/pages/admin-settings.ejs (modified) (2 diffs)
• 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 —————————————————————————————————————————

src/routes/admin-settings.js

@@ -33 +33 @@
 router.post('/', requireGod, (req, res) => {
   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

@@ -45 +45 @@
 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) {
@@ -225 +227 @@
 app.use('/admin/comments', adminCommentsRoutes);
 app.use('/admin/settings', adminSettingsRoutes);
+app.use('/admin/circle', adminCircleRoutes);
 app.use('/admin', adminRoutes);
 app.use('/prutter', prutterRoutes);
@@ -238 +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/CircleFederation.js

@@ -74 +74 @@
 // aan is_public (aparte expliciete flag volgt in de Beheer-UX-stap).
 function allowsCircle(site) {
-  return !!site && site.is_public !== 0;
+  return !!site && site.is_public !== 0 && site.allow_circle !== 0;
 }
 

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>
@@ -59 +66 @@
   </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>