Index: src/config/database.js =================================================================== --- src/config/database.js (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/config/database.js (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -469,4 +469,5 @@ 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 Index: src/routes/admin-paid.js =================================================================== --- src/routes/admin-paid.js (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/routes/admin-paid.js (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -60,4 +60,7 @@ 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, }); Index: src/routes/paid.js =================================================================== --- src/routes/paid.js (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/routes/paid.js (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -54,9 +54,12 @@ 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,5 +69,5 @@ 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, }); } Index: src/routes/posts.js =================================================================== --- src/routes/posts.js (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/routes/posts.js (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -21,5 +21,5 @@ 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,4 +1247,5 @@ pgCents: post.paid_min_cents || paidDefaultMinCents(site.id), pgSlug: post.slug, + pgPatronUrl: paidPatronUrl(site.id), newerPost, olderPost, Index: src/services/PaidPatreonService.js =================================================================== --- src/services/PaidPatreonService.js (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/services/PaidPatreonService.js (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -21,4 +21,5 @@ tokenExp: row.token_exp || 0, defaultMinCents: row.default_min_cents || 0, + patreonUrl: row.patreon_url || null, }; } @@ -36,5 +37,12 @@ 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,13 +60,15 @@ 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,4 +80,5 @@ merged.tokenExp || 0, Math.max(0, parseInt(merged.defaultMinCents, 10) || 0), + merged.patreonUrl || null, ); } @@ -171,5 +182,5 @@ export default { getOwnerConfig, ownerStatus, saveOwnerConfig, disconnect, - defaultMinCents, needsRefresh, refreshCreatorToken, creatorAccessToken, + defaultMinCents, patreonUrl, needsRefresh, refreshCreatorToken, creatorAccessToken, pickCampaignMembership, verifyPatron, }; Index: src/views/pages/admin-paid.ejs =================================================================== --- src/views/pages/admin-paid.ejs (revision 603d2461f6fb57f0422bea17aad09eef157f788f) +++ src/views/pages/admin-paid.ejs (revision c3d12a6f5721ed2faee19362b8d7e0caeea854d5) @@ -47,4 +47,8 @@ +