Changeset 0b7ebbf in Klonkt for src/server.js

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

File:

• src/server.js (modified) (5 diffs)

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);