Changeset 62b899d in Klonkt

Timestamp:

06/16/2026 07:02:15 PM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

fb02cc0

Parents:

682d504

Message:

Circle: strip shortcodes from summary + "Sync all now" button

[[playlist:..]]/[[track:..]]/[[album:..]]-shortcodes survived stripHtml (not
HTML) → appeared raw in the circle summary (buggy). Now stripped on ingest
(consumer) and on publish. Also added a global sync button on
Admin → Circle.

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

Location:

src

Files:

• routes/admin-circle.js (modified) (2 diffs)
• services/CircleFederation.js (modified) (1 diff)
• services/CircleService.js (modified) (1 diff)
• views/pages/admin-circle.ejs (modified) (1 diff)

src/routes/admin-circle.js

@@ -16 +16 @@
 import db from '../config/database.js';
 import { getTenancy } from '../services/SettingsService.js';
-import { syncOne } from '../services/CircleService.js';
+import { syncOne, sync } from '../services/CircleService.js';
 
 const router = express.Router();
@@ -95 +95 @@
 });
 
+// Alles in één keer verversen (handig "voor de zekerheid").
+router.post('/sync-all', requireGod, async (req, res) => {
+  try {
+    const r = await sync();
+    const n = (r && r.results) ? r.results.filter((x) => x && x.ok).length : 0;
+    res.redirect('/admin/circle?success=' + encodeURIComponent(`Cirkel gesynchroniseerd (${n} site(s) bijgewerkt)`));
+  } catch (e) {
+    res.redirect('/admin/circle?error=' + encodeURIComponent(String((e && e.message) || e).slice(0, 200)));
+  }
+});
+
 router.post('/allow', requireGod, (req, res) => {
   const site = primarySite();

src/services/CircleFederation.js

@@ -78 +78 @@
 
 function stripHtml(s) {
-  return String(s || '').replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+  return String(s || '')
+    .replace(/<[^>]+>/g, ' ')
+    .replace(/\[\[[^\]]*\]\]/g, ' ')   // [[playlist:..]]/[[track:..]]/[[album:..]]-shortcodes weg
+    .replace(/\s+/g, ' ')
+    .trim();
 }
 

src/services/CircleService.js

@@ -14 +14 @@
 
 function stripHtml(s) {
-  return String(s || '').replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+  return String(s || '')
+    .replace(/<[^>]+>/g, ' ')
+    .replace(/\[\[[^\]]*\]\]/g, ' ')   // [[playlist:..]]/[[track:..]]/[[album:..]]-shortcodes weg
+    .replace(/\s+/g, ' ')
+    .trim();
 }
 function iso(d) {

src/views/pages/admin-circle.ejs

@@ -52 +52 @@
       <p class="set-help">Nog geen bronnen. Voeg er hierboven een toe.</p>
     <% } else { %>
+      <form method="post" action="/admin/circle/sync-all" style="margin:0 0 .9rem">
+        <button type="submit" class="btn">&#8635; Alles nu synchroniseren</button>
+      </form>
       <ul class="circ-list">
         <% links.forEach(function(l){ %>