Index: src/routes/posts.js =================================================================== --- src/routes/posts.js (revision 7b04d3b709bae5f43a5c7f73f2d86123a46aa1d4) +++ src/routes/posts.js (revision 1485933f97b84aac69830de1bf053cabba6875f8) @@ -777,10 +777,20 @@ router.get('/messages', requireSiteManager, (req, res) => { const site = res.locals.site; - const items = site ? ActivityPubService.getMessages(site.slug, 80) : []; + const append = req.query.append === '1'; + const offset = Math.max(0, parseInt(req.query.offset, 10) || 0); + const page = site ? ActivityPubService.getMessages(site.slug, FEED_PAGE + 1, offset) : []; + const hasMore = page.length > FEED_PAGE; + const items = page.slice(0, FEED_PAGE); // Read the watermark BEFORE marking seen → unread dots on items newer than last visit. const seenAt = site ? ActivityPubService.notificationsSeenAt(site.slug) : 0; - if (site && !isViewer(req.session.user)) ActivityPubService.markNotificationsSeen(site.slug); + // Only stamp "seen" on the first page load (not on Load-more appends). + if (site && !append && !isViewer(req.session.user)) ActivityPubService.markNotificationsSeen(site.slug); + const moreBase = res.locals.siteUrlBase || ''; + if (append) { + return renderPage(req, res, 'partials/messages-append', { items, seen: seenAt, hasMore, nextOffset: offset + FEED_PAGE, moreBase }); + } renderPage(req, res, 'pages/messages', { pageTitleKey: 'msg.title', bodyClass: 'on-special', items, seenAt, + hasMore, nextOffset: offset + FEED_PAGE, moreBase, success: req.query.success || null, error: req.query.error || null, }); Index: src/services/ActivityPubService.js =================================================================== --- src/services/ActivityPubService.js (revision 7b04d3b709bae5f43a5c7f73f2d86123a46aa1d4) +++ src/services/ActivityPubService.js (revision 1485933f97b84aac69830de1bf053cabba6875f8) @@ -507,8 +507,14 @@ // outboxId), sorted as one stream. Consecutive likes/boosts on the same post collapse into // one grouped item (actors list + count) so activity doesn't drown out conversations. -export function getMessages(slug, limit) { - const items = getNotifications(slug, Math.max(120, (limit || 60))); +export function getMessages(slug, limit, offset) { + const off = Math.max(0, offset || 0); + const lim = limit || 60; + // The stream is grouped (consecutive likes/boosts collapse), so paging is done by + // recomputing the whole stream top-down and slicing [off, off+lim] — stable across + // pages. Fetch a buffer past off+lim so grouping-shrinkage can't hide a full page. + const need = off + lim + 100; + const items = getNotifications(slug, need); try { - for (const m of listOutbox(slug).slice(0, 80)) { + for (const m of listOutbox(slug).slice(0, need)) { items.push({ type: 'sent', outboxId: m.id, to_handle: m.to_handle, in_reply_to: m.in_reply_to, @@ -530,5 +536,5 @@ out.push(it); } - return out.slice(0, limit || 60); + return out.slice(off, off + lim); } @@ -2660,7 +2666,10 @@ // Notifications inbox: new followers + replies/likes/boosts on this site's posts. export function getNotifications(slug, limit) { + // Per-source cap scales with the requested limit so Messages can page deep + // (Load more). Bounded so a huge offset can't ask for unbounded rows. + const L = Math.min(1000, Math.max(80, limit || 60)); const out = []; try { - for (const f of db.prepare('SELECT actor_uri, created_at FROM ap_followers WHERE slug = ? ORDER BY created_at DESC LIMIT 50').all(slug)) { + for (const f of db.prepare('SELECT actor_uri, created_at FROM ap_followers WHERE slug = ? ORDER BY created_at DESC LIMIT ?').all(slug, L)) { out.push({ type: 'follow', handle: deriveHandle(f.actor_uri), url: f.actor_uri, created_at: f.created_at }); } @@ -2672,6 +2681,6 @@ FROM ap_interactions i LEFT JOIN posts p ON p.id = i.post_id WHERE p.site_id = (SELECT id FROM sites WHERE slug = ?) - ORDER BY i.created_at DESC LIMIT 80 - `).all(slug); + ORDER BY i.created_at DESC LIMIT ? + `).all(slug, L); for (const r of rows) out.push({ type: r.kind, name: r.actor_name, handle: r.actor_handle, url: r.actor_url, icon: r.actor_icon, @@ -2682,10 +2691,10 @@ } catch { /* ignore */ } try { - for (const r of db.prepare('SELECT actor_uri, actor_name, actor_handle, actor_icon, content, created_at FROM ap_reports WHERE slug = ? ORDER BY created_at DESC LIMIT 50').all(slug)) { + for (const r of db.prepare('SELECT actor_uri, actor_name, actor_handle, actor_icon, content, created_at FROM ap_reports WHERE slug = ? ORDER BY created_at DESC LIMIT ?').all(slug, L)) { out.push({ type: 'report', name: r.actor_name, handle: r.actor_handle, url: r.actor_uri, icon: r.actor_icon, content: r.content, created_at: r.created_at }); } } catch { /* ignore */ } try { - for (const r of db.prepare('SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, created_at FROM ap_mentions WHERE slug = ? ORDER BY created_at DESC LIMIT 50').all(slug)) { + for (const r of db.prepare('SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, created_at FROM ap_mentions WHERE slug = ? ORDER BY created_at DESC LIMIT ?').all(slug, L)) { out.push({ type: 'mention', name: r.actor_name, handle: r.actor_handle, url: r.actor_url || r.actor_uri, icon: r.actor_icon, content: stripLeadingMentions(r.content), note_url: r.note_url || r.object_uri, created_at: r.created_at }); } Index: src/views/pages/messages.ejs =================================================================== --- src/views/pages/messages.ejs (revision 7b04d3b709bae5f43a5c7f73f2d86123a46aa1d4) +++ src/views/pages/messages.ejs (revision 1485933f97b84aac69830de1bf053cabba6875f8) @@ -22,111 +22,9 @@

<%= t('msg.empty') %>

<% } else { %> -