Changeset c3d12a6 in Klonkt

Timestamp:

07/21/2026 02:07:18 AM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

9019a3e

Parents:

603d246

git-author:

Robin <roboburr@…> (07/21/2026 02:07:07 AM)

git-committer:

Robin <roboburr@…> (07/21/2026 02:07:18 AM)

Message:

Feature: a way to actually become a supporter, and a styled expired page

Bart's test surfaced two gaps in the visitor flow:

• After "Allow" on Patreon, a non-supporter landed on "Nog geen supporter" with no way to actually pledge. The page now shows a primary "Word supporter op Patreon" button. The site owner sets their public Patreon page in Beheer -> Betaalde posts (new field); it's also linked from the gate itself ("Nog geen supporter? Word het op Patreon").
• The invalid/expired callback replied with a raw res.send() plain-text line. It now renders the normal paid-result page (reason 'expired').

Changed files:
src/config/database.js

• paid_patreon.patreon_url column (additive)

src/services/PaidPatreonService.js

• patreonUrl in config/status/save (undefined keeps, empty clears) + patreonUrl(siteId) helper

src/routes/admin-paid.js

• save patreon_url from the form

src/views/pages/admin-paid.ejs

• "Openbare Patreon-pagina" field

src/routes/paid.js

• expired callback renders paid-result; pass patronUrl to the result pages

src/routes/posts.js

• pass pgPatronUrl to the gate

src/views/pages/paid-gate.ejs

• "Word supporter" join line under the unlock button

src/views/pages/paid-result.ejs

• "Word supporter op Patreon" primary button, 'expired' reason, ghost back button always has a label

test/paid-patron.test.js

• patreonUrl set/keep/clear semantics

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

Files:

• src/config/database.js (modified) (1 diff)
• src/routes/admin-paid.js (modified) (1 diff)
• src/routes/paid.js (modified) (2 diffs)
• src/routes/posts.js (modified) (2 diffs)
• src/services/PaidPatreonService.js (modified) (5 diffs)
• src/views/pages/admin-paid.ejs (modified) (1 diff)
• src/views/pages/paid-gate.ejs (modified) (2 diffs)
• src/views/pages/paid-result.ejs (modified) (4 diffs)
• test/paid-patron.test.js (modified) (1 diff)

src/config/database.js

@@ -469 +469 @@
   ensureColumn('posts', 'paid', 'INTEGER DEFAULT 0');        // paid post (klonkt-demo-aki)
   ensureColumn('posts', 'paid_min_cents', 'INTEGER');        // required support; null = owner default
+  ensureColumn('paid_patreon', 'patreon_url', 'TEXT');       // owner's public Patreon page → "Word supporter" link (klonkt-demo-aki)
   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/admin-paid.js

@@ -60 +60 @@
       accessToken: (b.access_token || '').trim() || undefined,
       refreshToken: (b.refresh_token || '').trim() || undefined,
+      // Empty clears it (null), a value sets it. Unlike secrets, this is not
+      // sensitive and there's a clear "remove the link" intent.
+      patreonUrl: (b.patreon_url || '').trim() || null,
       defaultMinCents: Number.isFinite(cents) ? cents : undefined,
     });

src/routes/paid.js

@@ -54 +54 @@
   const payload = verifyBlob(String(req.query.state || ''));
   if (!payload || payload.purpose !== 'patron' || payload.siteId !== r.site.id) {
-    return res.status(400).send('Ongeldige of verlopen aanvraag. Probeer opnieuw vanaf de post.');
+    return renderPage(req, res, 'pages/paid-result', {
+      pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false, reason: 'expired',
+    });
   }
+  const patronUrl = PaidPatreon.patreonUrl(r.site.id);
   const code = String(req.query.code || '');
   if (req.query.error || !code) {
-    return renderPage(req, res, 'pages/paid-result', { pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false, reason: 'declined', postSlug: payload.post });
+    return renderPage(req, res, 'pages/paid-result', { pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false, reason: 'declined', postSlug: payload.post, patronUrl });
   }
   const membership = await PaidPatreon.verifyPatron(r.site.id, code, baseUrl(req) + '/paid/callback').catch(() => null);
@@ -66 +69 @@
     return renderPage(req, res, 'pages/paid-result', {
       pageTitle: 'Ontgrendelen', bodyClass: 'on-special', ok: false,
-      reason: active ? 'tier' : 'notpatron', neededCents: payload.cents, haveCents: cents, postSlug: payload.post,
+      reason: active ? 'tier' : 'notpatron', neededCents: payload.cents, haveCents: cents, postSlug: payload.post, patronUrl,
     });
   }

src/routes/posts.js

@@ -21 +21 @@
 import ActivityPubService from '../services/ActivityPubService.js';
 import { premiumUnlocked } from '../services/PatreonService.js';
-import { defaultMinCents as paidDefaultMinCents } from '../services/PaidPatreonService.js';
+import { defaultMinCents as paidDefaultMinCents, patreonUrl as paidPatronUrl } from '../services/PaidPatreonService.js';
 import MusicMeta from '../services/MusicMeta.js';
 
@@ -1247 +1247 @@
       pgCents: post.paid_min_cents || paidDefaultMinCents(site.id),
       pgSlug: post.slug,
+      pgPatronUrl: paidPatronUrl(site.id),
       newerPost,
       olderPost,

src/services/PaidPatreonService.js

@@ -21 +21 @@
     tokenExp: row.token_exp || 0,
     defaultMinCents: row.default_min_cents || 0,
+    patreonUrl: row.patreon_url || null,
   };
 }
@@ -36 +37 @@
     tokenExp: c.tokenExp || 0,
     hasSecret: !!c.clientSecret,
+    patreonUrl: c.patreonUrl || null,
   };
+}
+
+// The owner's public Patreon page, for the "Word supporter" link. Null when unset.
+export function patreonUrl(siteId) {
+  const c = getOwnerConfig(siteId);
+  return c && c.patreonUrl ? c.patreonUrl : null;
 }
 
@@ -52 +60 @@
     tokenExp: patch.tokenExp ?? cur.tokenExp ?? 0,
     defaultMinCents: patch.defaultMinCents ?? cur.defaultMinCents ?? 0,
+    // undefined = keep (e.g. token refresh doesn't touch it); null/'' = clear.
+    patreonUrl: patch.patreonUrl !== undefined ? (patch.patreonUrl || null) : (cur.patreonUrl ?? null),
   };
   db.prepare(`INSERT INTO paid_patreon
-      (site_id, client_id, client_secret_enc, campaign_id, access_token_enc, refresh_token_enc, token_exp, default_min_cents, updated_at)
-      VALUES (?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)
+      (site_id, client_id, client_secret_enc, campaign_id, access_token_enc, refresh_token_enc, token_exp, default_min_cents, patreon_url, updated_at)
+      VALUES (?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)
     ON CONFLICT(site_id) DO UPDATE SET
       client_id=excluded.client_id, client_secret_enc=excluded.client_secret_enc,
       campaign_id=excluded.campaign_id, access_token_enc=excluded.access_token_enc,
       refresh_token_enc=excluded.refresh_token_enc, token_exp=excluded.token_exp,
-      default_min_cents=excluded.default_min_cents, updated_at=CURRENT_TIMESTAMP`)
+      default_min_cents=excluded.default_min_cents, patreon_url=excluded.patreon_url, updated_at=CURRENT_TIMESTAMP`)
     .run(
       siteId,
@@ -70 +80 @@
       merged.tokenExp || 0,
       Math.max(0, parseInt(merged.defaultMinCents, 10) || 0),
+      merged.patreonUrl || null,
     );
 }
@@ -171 +182 @@
 export default {
   getOwnerConfig, ownerStatus, saveOwnerConfig, disconnect,
-  defaultMinCents, needsRefresh, refreshCreatorToken, creatorAccessToken,
+  defaultMinCents, patreonUrl, needsRefresh, refreshCreatorToken, creatorAccessToken,
   pickCampaignMembership, verifyPatron,
 };

src/views/pages/admin-paid.ejs

@@ -47 +47 @@
       <input type="text" name="campaign_id" value="<%= status.campaignId || '' %>" autocomplete="off" style="width:100%">
     </label>
+    <label>Openbare Patreon-pagina
+      <input type="url" name="patreon_url" value="<%= status.patreonUrl || '' %>" placeholder="https://www.patreon.com/jouwnaam" autocomplete="off" style="width:100%">
+      <small style="color:var(--ink-soft,#888)">De link waar bezoekers supporter kunnen worden. Getoond als "Word supporter" wanneer iemand nog niet doneert.</small>
+    </label>
     <label>Creator access token
       <input type="password" name="access_token" placeholder="blijft ongewijzigd" autocomplete="off" style="width:100%">

src/views/pages/paid-gate.ejs

@@ -20 +20 @@
     <button type="button" id="pg-unlock" class="pg-btn">Ontgrendelen</button>
     <p id="pg-status" class="pg-status" hidden></p>
+    <% if (typeof pgPatronUrl !== 'undefined' && pgPatronUrl) { %>
+      <p class="pg-join">Nog geen supporter? <a href="<%= pgPatronUrl %>" target="_blank" rel="noopener">Word het op Patreon</a> en ontgrendel daarna met je passkey.</p>
+    <% } %>
   </section>
 </article>
@@ -88 +91 @@
   .pg-status { margin: 12px 0 0; opacity: .9; }
   .pg-status.is-err { color: #c0392b; }
+  .pg-join { margin: 14px 0 0; font-size: .92rem; opacity: .8; }
 </style>

src/views/pages/paid-result.ejs

@@ +1 @@
+<%
+  var _slug = (typeof postSlug !== 'undefined' && postSlug) ? postSlug : '';
+  var _base = (typeof siteUrlBase !== 'undefined' && siteUrlBase) ? siteUrlBase : '';
+  var _patron = (typeof patronUrl !== 'undefined' && patronUrl) ? patronUrl : '';
+%>
 <section class="pr">
   <div class="pr-card">
@@ -4 +9 @@
     <% if (reason === 'notpatron') { %>
       <h1 class="pr-h1">Nog geen supporter</h1>
-      <p class="pr-sub">Je bent (nog) geen actieve supporter van deze site op Patreon. Word supporter en probeer het opnieuw.</p>
+      <p class="pr-sub">Je bent (nog) geen actieve supporter van deze site op Patreon. Word supporter en probeer het daarna opnieuw vanaf de post.</p>
     <% } else if (reason === 'tier') { %>
       <h1 class="pr-h1">Een niveau hoger nodig</h1>
@@ -11 +16 @@
         Jouw steun is nu &euro;<%= ((typeof haveCents !== 'undefined' ? haveCents : 0)/100).toFixed(2) %>. Verhoog je steun en probeer opnieuw.
       </p>
+    <% } else if (reason === 'expired') { %>
+      <h1 class="pr-h1">Aanvraag verlopen</h1>
+      <p class="pr-sub">Deze ontgrendel-link is verlopen of al gebruikt. Ga terug naar de post en probeer het opnieuw.</p>
     <% } else { %>
       <h1 class="pr-h1">Ontgrendelen afgebroken</h1>
       <p class="pr-sub">Er is niets gekoppeld. Je kunt het opnieuw proberen vanaf de post.</p>
     <% } %>
-    <% if (typeof postSlug !== 'undefined' && postSlug) { %>
-      <p><a class="pr-btn" href="<%= (typeof siteUrlBase !== 'undefined' && siteUrlBase ? siteUrlBase : '') %>/<%= postSlug %>">Terug naar de post</a></p>
-    <% } %>
+
+    <div class="pr-actions">
+      <% if ((reason === 'notpatron' || reason === 'tier') && _patron) { %>
+        <a class="pr-btn" href="<%= _patron %>" target="_blank" rel="noopener">Word supporter op Patreon</a>
+      <% } %>
+      <% if (_slug) { %>
+        <a class="pr-btn pr-btn-ghost" href="<%= _base %>/<%= _slug %>">Terug naar de post</a>
+      <% } else { %>
+        <a class="pr-btn pr-btn-ghost" href="<%= _base %>/">Terug naar de site</a>
+      <% } %>
+    </div>
   </div>
 </section>
@@ -26 +42 @@
   .pr-ic { font-size: 38px; margin-bottom: 6px; }
   .pr-h1 { font-size: 23px; margin: 0 0 8px; }
-  .pr-sub { opacity: .85; line-height: 1.6; margin: 0 0 18px; }
+  .pr-sub { opacity: .85; line-height: 1.6; margin: 0 0 20px; }
+  .pr-actions { display: flex; flex-direction: column; gap: 10px; align-items: stretch; }
   .pr-btn { display: inline-block; padding: 11px 20px; border-radius: 10px; background: var(--accent,#6b8f71); color: #fff; text-decoration: none; font-weight: 600; }
+  .pr-btn-ghost { background: transparent; color: var(--ink,#222); border: 1px solid color-mix(in srgb, var(--ink,#000) 22%, transparent); }
 </style>

test/paid-patron.test.js

@@ -73 +73 @@
 });
 
+test('patreonUrl: set, kept on unrelated save, cleared on empty', () => {
+  PP.saveOwnerConfig('s2', { clientId: 'c', clientSecret: 's', campaignId: '7', patreonUrl: 'https://patreon.com/x' });
+  assert.equal(PP.patreonUrl('s2'), 'https://patreon.com/x');
+  // a save that does NOT mention patreonUrl (e.g. token refresh) keeps it
+  PP.saveOwnerConfig('s2', { defaultMinCents: 200 });
+  assert.equal(PP.patreonUrl('s2'), 'https://patreon.com/x');
+  // an explicit empty value clears it
+  PP.saveOwnerConfig('s2', { patreonUrl: '' });
+  assert.equal(PP.patreonUrl('s2'), null);
+});
+
 test('deleteEntitlement removes the row (forget-passkey path)', () => {
   Passkey.storeEntitlement({ credentialId: 'cred3', siteId: 's1', publicKey: 'PK', minCents: 100 });