Changeset 928d1c7 in Klonkt

Timestamp:

07/21/2026 01:06:47 AM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

9e9e6f9

Parents:

61e3daf

git-author:

Robin <roboburr@…> (07/21/2026 01:06:45 AM)

git-committer:

Robin <roboburr@…> (07/21/2026 01:06:47 AM)

Message:

Feature: paid posts slice 2, post model + teaser gate

A post can be marked paid (klonkt-demo-aki), premium-gated in the
editor with an optional per-post price; additive columns posts.paid +
paid_min_cents. On the web, a paid post shows only a teaser to anyone
who is not the owner/editor (new pages/paid-gate, mirroring the
fan-gate); the owner previews the full post. The passkey unlock arrives
in slices 3-4, so the gate says so for now.

Federation is leak-safe: buildNote federates only a PUBLIC teaser (the
excerpt, else the first paragraph, never later content) plus a
"read the full post (supporters)" link back, and no media attachments.
A short paid post can no longer spill its body: the teaser is the first
paragraph only, pinned by a test.

Changed files:
src/config/database.js

• additive columns posts.paid, posts.paid_min_cents

src/routes/posts.js

• create/update read paid + price (premium-gated), store them, pass to deliverCreate/Update; paidTeaser helper; the paid web gate

src/services/ActivityPubService.js

• buildNote: paid post -> public teaser + link, first paragraph only

src/views/pages/post-edit.ejs

• paid toggle + price field (in the premium block)

New file:
src/views/pages/paid-gate.ejs

• teaser + supporters notice

test/paid-federation.test.js

• teaser + link, no full content, excerpt-as-teaser, non-paid intact

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/config/database.js (modified) (1 diff)
• src/routes/posts.js (modified) (9 diffs)
• src/services/ActivityPubService.js (modified) (1 diff)
• src/views/pages/paid-gate.ejs (added)
• src/views/pages/post-edit.ejs (modified) (1 diff)
• test/paid-federation.test.js (added)

src/config/database.js

@@ -455 +455 @@
   ensureColumn('ap_outbox', 'attachments', 'TEXT');
   ensureColumn('posts', 'ap_visibility', 'TEXT');   // public|quiet|friends|direct (C2S addressing, shaer-60b)
+  ensureColumn('posts', 'paid', 'INTEGER DEFAULT 0');        // paid post (klonkt-demo-aki)
+  ensureColumn('posts', 'paid_min_cents', 'INTEGER');        // required support; null = owner default
   ensureColumn('ap_outbox', 'visibility', 'TEXT');  // 'direct' = private mention, never Public (shaer-tqc)
   ensureColumn('ap_outbox', 'to_actors', 'TEXT');   // JSON array of recipient actor URIs for direct notes

src/routes/posts.js

@@ -20 +20 @@
 import VideoCoverService from '../services/VideoCoverService.js';
 import ActivityPubService from '../services/ActivityPubService.js';
+import { premiumUnlocked } from '../services/PatreonService.js';
+import { defaultMinCents as paidDefaultMinCents } from '../services/PaidPatreonService.js';
 import MusicMeta from '../services/MusicMeta.js';
 
@@ -327 +329 @@
   const { title, slug, content, excerpt, status, pinned, cover_image_url, tags, noindex, type } = req.body;
   const fanOnly = req.body.fan_only ? 1 : 0;
+  const paid = (premiumUnlocked() && req.body.paid) ? 1 : 0;   // paid posts (klonkt-demo-aki)
+  const paidEur = String(req.body.paid_min_eur || '').replace(',', '.').trim();
+  const paidMinCents = paid && paidEur ? Math.round(parseFloat(paidEur) * 100) : null;
   const nsfw = req.body.nsfw ? 1 : 0;
   const cw = (req.body.content_warning || '').trim().slice(0, 200);
@@ -381 +386 @@
   );
   cacheRenderedContent(postId, cleanContent); // bake display HTML (ActivityPub `source` model)
+  db.prepare('UPDATE posts SET paid = ?, paid_min_cents = ? WHERE id = ?').run(paid, paidMinCents, postId);
 
   // Per-post "share audio on the fediverse" → set fedi_open on this post's hosted tracks
@@ -399 +405 @@
         id: postId, slug: finalSlug, title: title || finalSlug,
         content: cleanContent, cover_image_url: cover_image_url || null, cover_video_url: req.body.cover_video_url || null, cover_alt: coverAlt, language,
-        published_at: publishedAt, created_at: now, fan_only: fanOnly, nsfw, content_warning: cw, poll_json: pollJson,
+        published_at: publishedAt, created_at: now, fan_only: fanOnly, paid, paid_min_cents: paidMinCents, excerpt: excerpt || '', nsfw, content_warning: cw, poll_json: pollJson,
       }).catch(() => { /* best-effort */ });
     }
@@ -463 +469 @@
   const { title, content, excerpt, status, pinned, cover_image_url, tags, noindex, type } = req.body;
   const fanOnly = req.body.fan_only ? 1 : 0;
+  const paid = (premiumUnlocked() && req.body.paid) ? 1 : 0;   // paid posts (klonkt-demo-aki)
+  const paidEur = String(req.body.paid_min_eur || '').replace(',', '.').trim();
+  const paidMinCents = paid && paidEur ? Math.round(parseFloat(paidEur) * 100) : null;
   const nsfw = req.body.nsfw ? 1 : 0;
   const cw = (req.body.content_warning || '').trim().slice(0, 200);
@@ -522 +531 @@
   );
   cacheRenderedContent(post.id, cleanContent); // re-bake display HTML on edit (ActivityPub `source` model)
+  db.prepare('UPDATE posts SET paid = ?, paid_min_cents = ? WHERE id = ?').run(paid, paidMinCents, post.id);
 
   // Per-post "share audio on the fediverse" → set fedi_open on this post's hosted tracks
@@ -544 +554 @@
       id: post.id, slug: finalSlug, title: title || finalSlug,
       content: cleanContent, cover_image_url: cover_image_url || null, cover_video_url: req.body.cover_video_url || null, cover_alt: coverAlt, language,
-      published_at: publishedAt, created_at: post.created_at, fan_only: fanOnly, nsfw, content_warning: cw, poll_json: pollJson,
+      published_at: publishedAt, created_at: post.created_at, fan_only: fanOnly, paid, paid_min_cents: paidMinCents, excerpt: excerpt || '', nsfw, content_warning: cw, poll_json: pollJson,
     };
     if (post.status !== 'published') ActivityPubService.deliverCreate(site, apPost).catch(() => { /* best-effort */ });
@@ -638 +648 @@
 // post render and the fan gate (premium fan_only) so navigation is consistent
 // everywhere. Solo: within the site (pinned first, then date). Hub: globally by date.
+// A short public teaser for a paid post: its excerpt, else the first ~280 chars
+// of the (stripped) content. Shared by the web gate and federation.
+function paidTeaser(post, max = 280) {
+  if (post && post.excerpt && String(post.excerpt).trim()) return String(post.excerpt).trim();
+  // Only the FIRST paragraph: a paid teaser must never spill later content.
+  const html = String((post && post.content) || '');
+  const firstP = (html.match(/<p[^>]*>([\s\S]*?)<\/p>/i) || [null, html])[1] || '';
+  const text = firstP.replace(/<[^>]+>/g, ' ').replace(/&[a-z#0-9]+;/gi, ' ').replace(/\s+/g, ' ').trim();
+  return text.length > max ? text.slice(0, max).replace(/\s+\S*$/, '') + '…' : text;
+}
+
 function postNeighbors(site, post, isHub) {
   const urlBaseFor = (p) => (isHub && p && p.site_slug) ? `/user/${p.site_slug}` : '';
@@ -1120 +1141 @@
       fgTitle: post.title || '',
       fgNext: (res.locals.siteUrlBase || '') + '/' + post.slug,
+      newerPost,
+      olderPost,
+    });
+  }
+
+  // Paid gate (klonkt-demo-aki): a paid post shows only a teaser to anyone who
+  // is not the owner/editor. The passkey unlock arrives in slices 3-4; for now
+  // the owner previews the full post, everyone else sees the teaser + notice.
+  const canEditThis = req.session?.user && PermissionsService.canEditPost(req.session.user, post, site);
+  if (post.paid && !canEditThis) {
+    const { newerPost, olderPost } = postNeighbors(site, post, res.locals.tenancy === 'hub');
+    return renderPage(req, res, 'pages/paid-gate', {
+      pageTitle: post.title || 'Voor supporters',
+      bodyClass: 'on-special',
+      pgTitle: post.title || '',
+      pgTeaser: paidTeaser(post),
+      pgCents: post.paid_min_cents || paidDefaultMinCents(site.id),
+      pgSlug: post.slug,
       newerPost,
       olderPost,

src/services/ActivityPubService.js

@@ -278 +278 @@
   const escTitle = String(post.title || '').replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]));
   const titleHtml = post.title ? `<p><strong>${escTitle}</strong></p>` : '';
+
+  // Paid post (klonkt-demo-aki): federate a PUBLIC teaser + link, never the full
+  // content, so nothing leaks past the paywall. No media attachments either.
+  if (post.paid) {
+    const esc = (x) => String(x || '').replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]));
+    const _firstP = (String(post.content || '').match(/<p[^>]*>([\s\S]*?)<\/p>/i) || [null, ''])[1] || '';
+    const rawTeaser = String(post.excerpt || '').trim()
+      || _firstP.replace(/<[^>]+>/g, ' ').replace(/&[a-z#0-9]+;/gi, ' ').replace(/\s+/g, ' ').trim().slice(0, 280);
+    return {
+      '@context': AP_CONTEXT,
+      id,
+      type: 'Note',
+      attributedTo: aId,
+      content: `${titleHtml}<p>${esc(rawTeaser)}${rawTeaser ? '…' : ''}</p><p><a href="${human}">Lees de volledige post (supporters)</a></p>`,
+      url: human,
+      published: toISO(post.published_at || post.created_at || Date.now()),
+      to: [PUBLIC],
+      cc: [`${aId}/followers`],
+      tag: [...hashtagTags(base, post.content)],
+      replies: `${id}/replies`,
+    };
+  }
 
   // Images travel as AP `attachment` (Mastodon strips <img> from content). Collect

src/views/pages/post-edit.ejs

@@ -367 +367 @@
             <span>🔒 <%= t('pedit.fan_only_label') %></span>
           </label>
+          <label class="pe-checkbox" style="margin-top:8px">
+            <input type="checkbox" name="paid" value="1" id="pe-paid" <%= post.paid ? 'checked' : '' %>>
+            <span>💶 Betaalde post (supporters ontgrendelen met Patreon)</span>
+          </label>
+          <div id="pe-paid-price" style="margin:6px 0 0 26px;<%= post.paid ? '' : 'display:none' %>">
+            <label style="font-size:.85rem;opacity:.8">Vereist steunbedrag (euro, leeg = standaard)
+              <input type="text" name="paid_min_eur" inputmode="decimal" style="width:100px"
+                     value="<%= post.paid_min_cents ? (post.paid_min_cents/100).toFixed(2) : '' %>">
+            </label>
+          </div>
+          <script nonce="<%= cspNonce %>">
+            (function(){ var p=document.getElementById('pe-paid'), box=document.getElementById('pe-paid-price');
+              if (p&&box&&!p.__wired){ p.__wired=true; p.addEventListener('change', function(){ box.style.display=p.checked?'':'none'; }); } })();
+          </script>
           <% var _scheduled = !!(post.publish_at && (post.status === 'scheduled' || Date.parse(String(post.publish_at).replace(' ', 'T')) > Date.now())); %>
           <label class="pe-checkbox" style="margin-top:8px">