Changeset 2c22bb5 in Klonkt

Timestamp:

06/26/2026 08:53:42 AM (2 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

46f3dd6

Parents:

49b1b39

Message:

feat(cirkel): rebuild the Cirkel feed on ActivityPub (featured/auto-boosted artists)

Phase 2 of the Cirkels-on-AP rework. /cirkel now shows posts from the accounts a
site auto-boosts ("feature an artist"), sourced from ap_timeline ⋈ ap_following
(auto_boost=1); cards link to the source post. The Solo|Cirkel switcher shows
whenever the site has a cirkel (new hasCirkel local) instead of only on
circle-tenancy. Legacy circle-tenancy remote_posts are merged in until the old
pull-protocol is removed (Phase 4). New: autoBoostCount / getCirkelPosts /
getCirkelMembers.

Co-Authored-By: Claude <noreply@…>

Location:

src

Files:

• middleware/render.js (modified) (1 diff)
• routes/circle.js (modified) (2 diffs)
• services/ActivityPubService.js (modified) (2 diffs)
• views/partials/view-switcher.ejs (modified) (1 diff)

src/middleware/render.js

@@ -123 +123 @@
     canManageFedi,
     apEnabled: apEnabled(),
+    // Cirkel = the artists you feature (auto-boost). Shown when AP is on and you
+    // auto-boost ≥1 account, or (legacy) on a circle-tenancy site.
+    hasCirkel: !!(_site && ((apEnabled() && ActivityPubService.autoBoostCount(_site.slug) > 0) || (res.locals.tenancy || 'solo') === 'circle')),
     isViewer: _isViewer,
     canMutate: !_isViewer,

src/routes/circle.js

@@ -10 +10 @@
 import { renderPage } from '../middleware/render.js';
 import db from '../config/database.js';
-import { getTenancy } from '../services/SettingsService.js';
+import { getTenancy, apEnabled } from '../services/SettingsService.js';
+import ActivityPubService from '../services/ActivityPubService.js';
 
 const router = express.Router();
+
+function htmlToText(html) {
+  return String(html || '').replace(/<[^>]+>/g, ' ').replace(/&[a-z#0-9]+;/gi, ' ').replace(/\s+/g, ' ').trim();
+}
 
 function safeUrl(u) {
@@ -26 +31 @@
 
 // ── Overview ─────────────────────────────────────────────────
+// New model: the Cirkel = posts from the accounts this site auto-boosts
+// ("feature an artist"), sourced from ActivityPub. Cards link to the source
+// post (external_url). Legacy circle-tenancy remote_posts are merged in until
+// the old pull-protocol is removed (Phase 4).
 router.get('/cirkel', (req, res, next) => {
-  if (getTenancy() !== 'circle') return next();
+  const site = res.locals.site;
+  if (!site) return next();
+  const slug = site.slug;
+  const isCircle = getTenancy() === 'circle';
+  const abCount = apEnabled() ? ActivityPubService.autoBoostCount(slug) : 0;
+  if (!abCount && !isCircle) return next(); // no cirkel on this site
 
-  const rows = db.prepare(`
-    SELECT p.id, p.published, p.title, p.summary, p.media_json, p.tags,
-           a.name AS actor_name
-    FROM remote_posts p
-    JOIN remote_actors a ON a.id = p.actor_id
-    ORDER BY COALESCE(p.published, p.fetched_at) DESC
-    LIMIT 100
-  `).all();
+  let posts = [];
 
-  const posts = rows.map((r) => {
-    const image = mediaImage(r.media_json);
-    return {
-      id: r.id,
-      // Local reading page -> the card stays on the own site (post-card links
-      // locally + htmx, NO external_url).
-      slug: 'cirkel/' + encodeURIComponent(r.id),
-      title: r.title || '(zonder titel)',
-      excerpt: r.summary || '',
-      cover_image_url: image ? image.url : null,
-      published_at: r.published,
-      created_at: r.published,
-      type: 'post',
-      tags: r.tags || '',
-      pinned: 0,
-      status: 'published',
-      source_name: r.actor_name || 'Onbekend',
-    };
-  });
+  // Featured (auto-boosted) fediverse posts → link to the original.
+  if (abCount) {
+    posts = ActivityPubService.getCirkelPosts(slug, 80).map((r) => {
+      const text = htmlToText(r.content);
+      const image = mediaImage(r.media_json);
+      const name = r.author_name || r.author_handle || 'Onbekend';
+      return {
+        id: 'ap-' + r.id,
+        slug: '',
+        title: text ? (text.length > 90 ? text.slice(0, 90) + '…' : text) : name,
+        excerpt: '',
+        cover_image_url: image ? image.url : null,
+        published_at: r.published,
+        created_at: r.published,
+        type: 'post',
+        tags: '',
+        pinned: 0,
+        status: 'published',
+        source_name: name,
+        external_url: safeUrl(r.url),
+      };
+    });
+  }
 
-  // Sites in the circle — active links only (outdated/error ones are excluded, along
-  // with their posts). Used for the graphic header with avatars.
-  const sites = db.prepare(`
-    SELECT a.name, a.url, a.avatar
-    FROM remote_actors a
-    JOIN circle_links l ON l.remote_actor_id = a.id
-    WHERE l.status = 'active'
-    ORDER BY a.name
-  `).all()
-    .map((s) => ({
-      name: s.name || 'Onbekend',
-      url: safeUrl(s.url),
-      avatar: safeUrl(s.avatar),
-    }));
+  // Legacy circle-tenancy remote_posts (local reading page, no external_url).
+  if (isCircle) {
+    const rows = db.prepare(`
+      SELECT p.id, p.published, p.title, p.summary, p.media_json, p.tags, a.name AS actor_name
+      FROM remote_posts p JOIN remote_actors a ON a.id = p.actor_id
+      ORDER BY COALESCE(p.published, p.fetched_at) DESC LIMIT 100
+    `).all().map((r) => {
+      const image = mediaImage(r.media_json);
+      return {
+        id: r.id, slug: 'cirkel/' + encodeURIComponent(r.id),
+        title: r.title || '(zonder titel)', excerpt: r.summary || '',
+        cover_image_url: image ? image.url : null, published_at: r.published, created_at: r.published,
+        type: 'post', tags: r.tags || '', pinned: 0, status: 'published', source_name: r.actor_name || 'Onbekend',
+      };
+    });
+    posts = posts.concat(rows);
+  }
+
+  posts.sort((a, b) => String(b.published_at || '').localeCompare(String(a.published_at || '')));
+
+  // Members header (avatars): featured artists + legacy circle links.
+  let sites = abCount
+    ? ActivityPubService.getCirkelMembers(slug).map((s) => ({ name: s.name || 'Onbekend', url: safeUrl(s.url), avatar: safeUrl(s.icon) }))
+    : [];
+  if (isCircle) {
+    const old = db.prepare(`
+      SELECT a.name, a.url, a.avatar FROM remote_actors a
+      JOIN circle_links l ON l.remote_actor_id = a.id WHERE l.status = 'active' ORDER BY a.name
+    `).all().map((s) => ({ name: s.name || 'Onbekend', url: safeUrl(s.url), avatar: safeUrl(s.avatar) }));
+    sites = sites.concat(old);
+  }
 
   renderPage(req, res, 'pages/circle-feed', { pageTitle: 'Cirkel', bodyClass: 'on-cirkel', posts, sites });

src/services/ActivityPubService.js

@@ -1032 +1032 @@
 export function getTimeline(slug, limit) { return tlStmts().list.all(slug, limit || 50); }
 
+// ── Cirkel = posts from the accounts you auto-boost ("feature an artist") ──
+let _abCount, _cirkelPosts, _cirkelMembers;
+export function autoBoostCount(slug) {
+  try { if (!_abCount) _abCount = db.prepare('SELECT COUNT(*) AS n FROM ap_following WHERE slug = ? AND auto_boost = 1'); return _abCount.get(slug).n; } catch { return 0; }
+}
+export function getCirkelPosts(slug, limit) {
+  try {
+    if (!_cirkelPosts) _cirkelPosts = db.prepare(`
+      SELECT t.id, t.author_uri, t.author_name, t.author_handle, t.author_icon, t.author_url,
+             t.content, t.url, t.published, t.media_json
+      FROM ap_timeline t
+      JOIN ap_following f ON f.slug = t.slug AND f.actor_uri = t.author_uri AND f.auto_boost = 1
+      WHERE t.slug = ?
+      ORDER BY COALESCE(t.published, t.created_at) DESC, t.rowid DESC
+      LIMIT ?`);
+    return _cirkelPosts.all(slug, limit || 60);
+  } catch { return []; }
+}
+export function getCirkelMembers(slug) {
+  try { if (!_cirkelMembers) _cirkelMembers = db.prepare('SELECT name, url, icon FROM ap_following WHERE slug = ? AND auto_boost = 1 ORDER BY name'); return _cirkelMembers.all(slug); } catch { return []; }
+}
+
 // Follow a fediverse account by @handle (WebFinger → actor → signed Follow).
 export async function followActor(site, handle, autoBoost = false) {
@@ -1190 +1212 @@
   listOutbox, deliverOutboxDelete,
   webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, getTimeline, sendInteraction,
+  autoBoostCount, getCirkelPosts, getCirkelMembers,
   getNotifications, listBlocks, isBlockedAny, blockTarget, unblock,
   deliverWithRetry, enqueueDelivery, processDeliveryQueue, startDeliveryWorker,

src/views/partials/view-switcher.ejs

@@ -23 +23 @@
     </div>
     <% } %>
-    <% if (typeof tenancy !== 'undefined' && tenancy === 'circle') {
+    <% if (typeof hasCirkel !== 'undefined' && hasCirkel) {
          var _onCirkel = (typeof bodyClass === 'string' && bodyClass.indexOf('on-cirkel') >= 0);
          var _sb = (typeof siteUrlBase !== 'undefined' && siteUrlBase) ? siteUrlBase : '';