Changeset 8aa85d0 in Klonkt

Timestamp:

06/16/2026 06:58:03 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

2c246d4

Parents:

eef691e

Message:

Prutter = premium Hub feature: Hub-only + behind premium gate

Prutter (DMs) is now hard-scoped to Hub mode (route 404s outside hub) and
locked behind the premium gate via the new premiumUnlocked() (= premium off
→ freely available, demos keep working; premium on → Patreon required).
UI entry points (topnav/bottom-tab/Send DM) follow the same condition.
Added to the premium description in Admin → Settings.

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

Location:

src

Files:

• middleware/render.js (modified) (2 diffs)
• routes/prutter.js (modified) (2 diffs)
• services/PatreonService.js (modified) (1 diff)
• views/pages/admin-settings.ejs (modified) (1 diff)
• views/pages/user.ejs (modified) (1 diff)
• views/partials/bottom-tab.ejs (modified) (1 diff)
• views/partials/topnav.ejs (modified) (1 diff)

src/middleware/render.js

@@ -18 +18 @@
 import { isViewer } from './auth.js';
 import { getSetting } from '../services/SettingsService.js';
-import { isPremium as isPremiumInstance, premiumEnabled } from '../services/PatreonService.js';
+import { isPremium as isPremiumInstance, premiumEnabled, premiumUnlocked } from '../services/PatreonService.js';
 import { PLATFORMS as PLATFORMS_CATALOG } from '../services/PlatformIcons.js';
 
@@ -80 +80 @@
     isPremium: isPremiumInstance(),
     premiumEnabled: premiumEnabled(),
+    premiumUnlocked: premiumUnlocked(),
     siteOwnerAvatar,
     site: _site,

src/routes/prutter.js

@@ -19 +19 @@
 import { renderPage } from '../middleware/render.js';
 import { requireAuth, isViewer } from '../middleware/auth.js';
+import { getTenancy } from '../services/SettingsService.js';
+import { premiumUnlocked } from '../services/PatreonService.js';
 import PermissionsService from '../services/PermissionsService.js';
 
@@ -31 +33 @@
 }
 
-// Middleware: require both auth + Prutter enabled
+// Middleware: Prutter = Hub-feature achter de premium-laag, plus login.
+//  - alleen in Hub-modus (DM tussen artiesten/leden van het collectief)
+//  - vergrendeld als de premium-laag aan staat maar Patreon niet gekoppeld is
+//    (premium uit = niet gegate → huidige gedrag, demo's blijven werken)
+//  - geen anonieme DMs
 function requirePrutter(req, res, next) {
   if (!siteAllowsDM(req, res)) return res.status(404).send('Prutter not enabled on this site');
+  if (getTenancy() !== 'hub') return res.status(404).send('Prutter is alleen beschikbaar in Hub-modus');
+  if (!premiumUnlocked()) {
+    return res.status(403).send('Prutter is een premium-functie — koppel Patreon in Beheer → Instellingen.');
+  }
   return requireAuth(req, res, next);
 }

src/services/PatreonService.js

@@ -82 +82 @@
 }
 
+// Is een premium-feature beschikbaar? True als de premium-laag UIT staat (dan is
+// niets gegate — huidige gedrag), of AAN én deze instance is entitled. False alleen
+// als premium aan staat maar er geen geldige Patreon-koppeling is (= betaalmuur).
+export function premiumUnlocked() {
+  return !premiumEnabled() || isPremium();
+}
+
 export function entitlementStatus() {
   return {

src/views/pages/admin-settings.ejs

@@ -44 +44 @@
   <section class="set-card" style="margin-top:1rem">
     <h2>Premium (Patreon)</h2>
-    <p class="set-help">Ontgrendel de premium-modules (Hub-modus, Statistieken, Fan-login)
-      met je <strong>$10-lifetime</strong> Patreon-steun. De app en alle updates blijven gratis.</p>
+    <p class="set-help">Ontgrendel de premium-modules (Hub-modus, Statistieken, Fan-login,
+      Prutter-DMs) met je <strong>$10-lifetime</strong> Patreon-steun. De app en alle updates
+      blijven gratis.</p>
     <% if (premium.premium) { %>
       <p class="set-help"><strong>✓ Premium actief.</strong>

src/views/pages/user.ejs

@@ -27 +27 @@
         <% } %>
       </p>
-      <% if (user && user.id !== author.id && site && site.enable_prutter) { %>
+      <% if (user && user.id !== author.id && site && site.enable_prutter && (typeof tenancy !== 'undefined' && tenancy === 'hub') && (typeof premiumUnlocked === 'undefined' || premiumUnlocked)) { %>
         <p class="user-actions">
           <a href="<%= siteUrlBase %>/prutter/new?to=<%= encodeURIComponent(author.username) %>" class="btn btn-primary">💬 Send DM</a>

src/views/partials/bottom-tab.ejs

@@ -13 +13 @@
 const _canPost     = !!(user && (typeof canMutate === 'undefined' || canMutate)
                         && permissions && permissions.canCreatePost && permissions.canCreatePost(user, site));
-const _hasPrutter  = !!(user && site && site.enable_prutter && (typeof tenancy !== 'undefined' && tenancy === 'hub'));
+const _hasPrutter  = !!(user && site && site.enable_prutter && (typeof tenancy !== 'undefined' && tenancy === 'hub') && (typeof premiumUnlocked === 'undefined' || premiumUnlocked));
 const _ownProfile  = user ? ('/users/' + user.username) : null;
 

src/views/partials/topnav.ejs

@@ -15 +15 @@
 const _isAdmin     = typeof bodyClass !== 'undefined' && bodyClass.indexOf('on-admin') >= 0;
 const _hasSearch   = !site || site.show_search === undefined || site.show_search;
-const _hasPrutter  = user && site && site.enable_prutter && (typeof tenancy !== 'undefined' && tenancy === 'hub');
+const _hasPrutter  = user && site && site.enable_prutter && (typeof tenancy !== 'undefined' && tenancy === 'hub') && (typeof premiumUnlocked === 'undefined' || premiumUnlocked);
 const _canPost     = user && (typeof canMutate === 'undefined' || canMutate)
                      && permissions && permissions.canCreatePost && permissions.canCreatePost(user, site);