Changeset 8f2f97c in Klonkt

Timestamp:

06/23/2026 02:24:46 PM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

cb01666

Parents:

24cdcc6

Message:

Prutter (DM feature) fully removed

Reason: redundant feature + unnecessary attack surface (real-time WebSocket +
storing private messages = privacy/abuse risk). Removed: routes/prutter.js,
PrutterService, the WebSocket server in server.js, both DM views, all nav links
(topnav/bottom-tab), the DM button on profiles, the per-site enable_prutter
toggle and column. Existing (empty) DM tables in old DBs remain untouched but
are no longer referenced anywhere. No WebSocket left in the app.

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

Location:

src

Files:

• config/database.js (modified) (1 diff)
• routes/admin-sites.js (modified) (4 diffs)
• routes/posts.js (modified) (1 diff)
• routes/prutter.js (deleted)
• server.js (modified) (6 diffs)
• services/PrutterService.js (deleted)
• views/pages/admin-site-edit.ejs (modified) (1 diff)
• views/pages/prutter-conversation.ejs (deleted)
• views/pages/prutter-inbox.ejs (deleted)
• views/pages/user.ejs (modified) (1 diff)
• views/partials/bottom-tab.ejs (modified) (3 diffs)
• views/partials/topnav.ejs (modified) (2 diffs)
• views/shell.ejs (modified) (1 diff)

src/config/database.js

@@ -47 +47 @@
   // Site-level moderation toggle. 'trust' = auto-approve, 'moderate' = pending until reviewed.
   ensureColumn('sites', 'comments_moderation_mode', "TEXT DEFAULT 'moderate'");
-  // Per-site Prutter toggle: when off, DM endpoints/UI are hidden for that site.
-  ensureColumn('sites', 'enable_prutter', 'INTEGER DEFAULT 1');
   // Cirkels: mag deze site in cirkels van anderen verschijnen (surfacing opt-out).
   ensureColumn('sites', 'allow_circle', 'INTEGER DEFAULT 1');

src/routes/admin-sites.js

@@ -98 +98 @@
 const RESERVED_SITE_SLUGS = new Set([
   'auth', 'admin', 'login', 'register', 'logout', 'archive', 'search',
-  'account', 'sites', 'comments', 'posts', 'media', 'audio', 'prutter',
+  'account', 'sites', 'comments', 'posts', 'media', 'audio',
   'forum', 'tag', 'user', 'users', 'artiesten', 'leden', 'feed.xml', 'atom.xml', 'sitemap.xml',
   'manifest.webmanifest', 'sw.js', 'favicon.ico', 'favicon.svg', 'assets',
@@ -119 +119 @@
     require_login_to_comment: 1,
     enable_audio_player: 1,
-    enable_prutter: 1,
     comments_moderation_mode: 'moderate',
     feed_view_default: 'grid',
@@ -300 +299 @@
       profile_links = ?,
       is_public = ?, robots_index = ?, require_login_to_comment = ?,
-      enable_audio_player = ?, enable_prutter = ?,
+      enable_audio_player = ?,
       comments_moderation_mode = ?,
       feed_view_default = ?, feed_view_switch = ?,
@@ -322 +321 @@
     f.require_login_to_comment ? 1 : 0,
     f.enable_audio_player ? 1 : 0,
-    f.enable_prutter ? 1 : 0,
     moderationMode,
     feedViewDef,

src/routes/posts.js

@@ -81 +81 @@
   'auth', 'admin', 'login', 'register', 'logout',
   'archive', 'search', 'account', 'sites', 'comments',
-  'posts', 'media', 'audio', 'prutter', 'forum',
+  'posts', 'media', 'audio', 'forum',
   'tag', 'type', 'user', 'users', 'artiesten', 'leden', 'favorieten', 'feed.xml', 'atom.xml', 'sitemap.xml',
   'manifest.webmanifest', 'sw.js', 'favicon.ico', 'favicon.svg', 'assets',

src/server.js

@@ -19 +19 @@
 import { SqliteSessionStore } from './services/SqliteSessionStore.js';
 import { ensurePrimarySite } from './services/ensurePrimarySite.js';
-import PrutterService from './services/PrutterService.js';
-import { WebSocketServer } from 'ws';
-
 import { resolveSite, loadAudioTracks, loadTheme } from './middleware/site.js';
 import { isViewer } from './middleware/auth.js';
@@ -36 +33 @@
 import adminSettingsRoutes from './routes/admin-settings.js';
 import adminSeoRoutes from './routes/admin-seo.js';
-import prutterRoutes from './routes/prutter.js';
 import audioRoutes from './routes/audio.js';
 import searchRoutes from './routes/search.js';
@@ -206 +202 @@
 })();
 
-// Singleton PrutterService — routes get it via req.app.locals.prutter.
-const prutter = new PrutterService(db);
-app.locals.prutter = prutter;
-
 // Cirkels-federatie: publieke, site-agnostische endpoints (/.klonkt/*).
 // Vóór resolveSite/theme — ze hebben geen site-context nodig.
@@ -274 +266 @@
 app.use('/admin/epk', adminEpkRoutes);
 app.use('/admin', adminRoutes);
-app.use('/prutter', prutterRoutes);
 app.use('/audio', audioRoutes);
 app.use('/search', searchRoutes);
@@ -422 +413 @@
 });
 
-// ==================== WebSocket: Prutter real-time ====================
-// Authenticate via the existing session cookie. We reuse sessionMiddleware
-// during the HTTP upgrade so req.session is populated; if no user, abort.
-const wss = new WebSocketServer({ noServer: true });
-
-server.on('upgrade', (req, socket, head) => {
-  if (req.url !== '/ws/prutter') {
-    socket.destroy();
-    return;
-  }
-  // Run session middleware on the upgrade request.
-  // (Express's middleware accepts (req, res, next); we pass a stub res.)
-  const stubRes = { setHeader: () => {}, getHeader: () => undefined, on: () => {}, end: () => {} };
-  sessionMiddleware(req, stubRes, () => {
-    if (!req.session?.user) {
-      socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
-      socket.destroy();
-      return;
-    }
-    // Kijker-accounts zijn alleen-lezen: weiger de WS-upgrade. De HTTP-guard
-    // dekt geen WS, dus dit is de plek om schrijven via een (toekomstige)
-    // message-handler te voorkomen.
-    if (isViewer(req.session.user)) {
-      socket.write('HTTP/1.1 403 Forbidden\r\n\r\n');
-      socket.destroy();
-      return;
-    }
-    wss.handleUpgrade(req, socket, head, (ws) => {
-      ws.userId = req.session.user.id;
-      wss.emit('connection', ws, req);
-    });
-  });
-});
-
-wss.on('connection', (ws) => {
-  prutter.addConnection(ws.userId, ws);
-  ws.on('close', () => prutter.removeConnection(ws.userId, ws));
-  ws.on('error', () => prutter.removeConnection(ws.userId, ws));
-  // Optional: ping every 30s to keep connections alive through proxies
-  ws.isAlive = true;
-  ws.on('pong', () => { ws.isAlive = true; });
-});
-const wsPing = setInterval(() => {
-  for (const ws of wss.clients) {
-    if (ws.isAlive === false) { ws.terminate(); continue; }
-    ws.isAlive = false;
-    try { ws.ping(); } catch {}
-  }
-}, 30000);
-if (wsPing.unref) wsPing.unref();
-
 server.listen(PORT, () => {
   console.log('');
@@ -483 +423 @@
   console.log(`   ✓ Auth:     wachtwoord (beheer) + Google (luisteraars) / logout`);
   console.log(`   ✓ Posts:    create / edit / view / archive`);
-  console.log(`   ✓ Realtime: WebSocket server ready (Prutter)`);
   console.log('');
   console.log(`   Mode: ${isDev ? 'development' : 'PRODUCTION'}`);

src/views/pages/admin-site-edit.ejs

@@ -163 +163 @@
         <span><%= t('asite.enable_audio') %></span>
       </label>
-      <%# Prutter is een Hub-only premium-functie — toggle alleen tonen in Hub-modus. %>
-      <% if (typeof tenancy !== 'undefined' && tenancy === 'hub') { %>
-      <label class="cb">
-        <input type="checkbox" name="enable_prutter" value="1" <%= site.enable_prutter ? 'checked' : '' %>>
-        <span><%= t('asite.enable_prutter') %> <small class="form-hint-inline"><%= t('asite.enable_prutter_hint') %></small></span>
-      </label>
-      <% } %>
     </fieldset>
 

src/views/pages/user.ejs

@@ -27 +27 @@
         <% } %>
       </p>
-      <% 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">💬 <%= t('pusr.send_dm') %></a>
-        </p>
-      <% } %>
     </div>
   </header>

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') && (typeof premiumUnlocked === 'undefined' || premiumUnlocked));
 const _ownProfile  = user ? ('/users/' + user.username) : null;
 const _isHub       = (typeof tenancy !== 'undefined' && tenancy === 'hub');
@@ -32 +31 @@
 else if (_p.indexOf('/search') === 0 || _p.indexOf('/tag/') === 0 || _p.indexOf('/type/') === 0) _active = 'search';
 else if (_p === '/posts/new' || /^\/posts\/[^/]+\/edit$/.test(_p)) _active = 'create';
-else if (_p.indexOf('/prutter') === 0) _active = 'prutter';
 else if (_p.indexOf('/account') === 0 || (_ownProfile && _p.indexOf(_ownProfile) === 0)) _active = 'profile';
 else if (_p.indexOf('/auth/login') === 0) _active = 'login';
@@ -80 +78 @@
   <% } %>
 
-  <!-- Prutter (DMs) -->
-  <% if (_hasPrutter) { %>
-    <a class="bottom-tab-item<%= _active === 'prutter' ? ' is-active' : '' %>"
-       href="<%= _siteUrlBase %>/prutter"
-       aria-label="Prutter berichten" <%= _active === 'prutter' ? 'aria-current="page"' : '' %>>
-      <svg class="bottom-tab-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
-        <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/>
-      </svg>
-      <span class="bottom-tab-label">Prutter</span>
-      <% if (typeof unreadDmCount !== 'undefined' && unreadDmCount > 0) { %>
-        <span class="bottom-tab-badge" aria-label="<%= unreadDmCount %> ongelezen"><%= unreadDmCount > 99 ? '99+' : unreadDmCount %></span>
-      <% } %>
-    </a>
-  <% } %>
 
   <!-- Profiel / Inloggen -->

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') && (typeof premiumUnlocked === 'undefined' || premiumUnlocked);
 const _canPost     = user && (typeof canMutate === 'undefined' || canMutate)
                      && permissions && permissions.canCreatePost && permissions.canCreatePost(user, site);
@@ -98 +97 @@
           </div>
         </details>
-      <% } %>
-
-      <% if (_hasPrutter) { %>
-        <a class="nav-btn" href="<%= _siteUrlBase %>/prutter" aria-label="Prutter (DMs)" title="Prutter">
-          <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/></svg>
-        </a>
       <% } %>
 

src/views/shell.ejs

@@ -33 +33 @@
 // Listing pages (search/tag/type/archive) shouldn't be indexed (dupe content)
 if (currentPath) {
-  if (/^\/(?:search|tag|type|archive|users|prutter|account|admin)(?:$|\/)/.test(currentPath)) {
+  if (/^\/(?:search|tag|type|archive|users|account|admin)(?:$|\/)/.test(currentPath)) {
     _shouldIndex = false;
   }