From d80aa3b96b9af75880c15809dfe02a392d253a0b Mon Sep 17 00:00:00 2001
From: Kibi Kelburton <git@f0ck.it>
Date: Tue, 14 Jul 2026 23:59:54 +0200
Subject: [PATCH] limit sidebar comments to 20

---
 public/s/js/sidebar-activity.js | 43 +++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/public/s/js/sidebar-activity.js b/public/s/js/sidebar-activity.js
index 9817fe7..b32199f 100644
--- a/public/s/js/sidebar-activity.js
+++ b/public/s/js/sidebar-activity.js
@@ -584,6 +584,7 @@
 
     const SIDEBAR_PAGE_LIMIT = 15;
     const SIDEBAR_INITIAL_LIMIT = 15;
+    const SIDEBAR_MAX_COMMENTS = 20;
 
     const loadActivity = async (silent = false) => {
         const container = document.getElementById('sidebar-activity-container');
@@ -609,11 +610,12 @@
             const data = await res.json();
 
             if (data.success && data.comments && data.comments.length > 0) {
-                window._sidebarActivityCache = data.comments.map(c => ({
+                window._sidebarActivityCache = data.comments.slice(0, SIDEBAR_MAX_COMMENTS).map(c => ({
                     ...c,
                     body: c.content || c.body
                 }));
-                hasMore = data.hasMore === true || data.comments.length === SIDEBAR_INITIAL_LIMIT;
+                hasMore = (data.hasMore === true || data.comments.length === SIDEBAR_INITIAL_LIMIT)
+                    && window._sidebarActivityCache.length < SIDEBAR_MAX_COMMENTS;
                 renderFromCache();
                 // Also check after a delay to account for image/emoji loading shifts
                 setTimeout(checkOverflow, 500);
@@ -662,17 +664,21 @@
 
             if (data.success && data.comments && data.comments.length > 0) {
                 currentPage++;
-                hasMore = data.hasMore === true;
 
-                // Append only comments not already in the cache
+                // Append only comments not already in the cache, up to the global cap
+                const remaining = SIDEBAR_MAX_COMMENTS - window._sidebarActivityCache.length;
                 const existingIds = new Set(window._sidebarActivityCache.map(c => String(c.id)));
-                const newComments = data.comments.filter(c => !existingIds.has(String(c.id))).map(c => ({
-                    ...c,
-                    body: c.content || c.body
-                }));
+                const newComments = data.comments
+                    .filter(c => !existingIds.has(String(c.id)))
+                    .slice(0, remaining)
+                    .map(c => ({ ...c, body: c.content || c.body }));
 
                 window._sidebarActivityCache.push(...newComments);
 
+                // Stop loading more if the hard cap is reached
+                hasMore = data.hasMore === true
+                    && window._sidebarActivityCache.length < SIDEBAR_MAX_COMMENTS;
+
                 // Append new items to DOM
                 let html = '';
                 newComments.forEach(c => { html += renderActivityItem(c); });
@@ -687,7 +693,7 @@
                     }
                     // Keep the IO sentinel at the very end so it triggers on the next scroll
                     if (ioSentinel) container.appendChild(ioSentinel);
-                    
+
                     addedNodes.forEach(node => {
                         attachMediaLoadListeners(node);
                         checkOverflow(node);
@@ -696,6 +702,14 @@
                     // Auto-play converted GIF videos
                     container.querySelectorAll('video.autoplay-gif').forEach(v => { v.autoplay = true; v.muted = true; v.play().catch(() => { v.addEventListener('canplay', () => v.play().catch(() => { }), { once: true }); }); });
                 }
+
+                if (!hasMore) {
+                    // Show end-of-feed indicator
+                    const end = document.createElement('div');
+                    end.style.cssText = 'text-align:center;padding:8px 0;font-size:0.75em;color:#444;';
+                    end.textContent = window.f0ckI18n?.sidebar_end_of_activity || '─ end of activity ─';
+                    container.appendChild(end);
+                }
             } else {
                 hasMore = false;
                 // Show end-of-feed indicator
@@ -722,7 +736,7 @@
             return;
         }
 
-        // 2. Update cache (prepend, no hard cap — infinite scroll handles depth)
+        // 2. Update cache (prepend, capped at SIDEBAR_MAX_COMMENTS)
         const newItem = {
             ...data,
             body: data.body || data.content,
@@ -730,6 +744,15 @@
         };
         window._sidebarActivityCache.unshift(newItem);
 
+        // Trim cache to the hard cap and remove the evicted DOM node (if any)
+        if (window._sidebarActivityCache.length > SIDEBAR_MAX_COMMENTS) {
+            const evicted = window._sidebarActivityCache.pop();
+            if (container && evicted) {
+                const evictedEl = document.getElementById('sc' + evicted.id);
+                if (evictedEl) evictedEl.remove();
+            }
+        }
+
         // Update DOM if visible
         if (container) {
             const html = renderActivityItem(newItem);