Index: c/routes/admin-comments.js =================================================================== --- src/routes/admin-comments.js (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ (revision ) @@ -1,81 +1,0 @@ -/** - * Admin: Comment moderation queue — Phase E. - * - * GET /admin/comments -> list pending + recent (god-only) - * POST /admin/comments/:id/approve -> set status = 'approved' - * POST /admin/comments/:id/reject -> set status = 'rejected' (keeps the row - * so we have a paper trail; admin can - * hard-delete via the post page). - * - * Scope: shows comments for the resolved site only (the one matched by - * /sites/:slug or default). Future: filter by status / search. - */ - -import express from 'express'; -import db from '../config/database.js'; -import { renderPage } from '../middleware/render.js'; -import { requireSiteManager } from '../middleware/auth.js'; - -const router = express.Router(); - -router.get('/', requireSiteManager, (req, res) => { - const site = res.locals.site; - if (!site) return res.status(404).send('No site'); - - const pending = db.prepare(` - SELECT c.id, c.content, c.created_at, c.parent_comment_id, - u.username AS author_username, - p.slug AS post_slug, p.title AS post_title - FROM comments c - JOIN users u ON u.id = c.author_id - JOIN posts p ON p.id = c.post_id - WHERE p.site_id = ? AND c.status = 'pending' - ORDER BY c.created_at ASC - LIMIT 200 - `).all(site.id); - - const recent = db.prepare(` - SELECT c.id, c.content, c.created_at, c.status, - u.username AS author_username, - p.slug AS post_slug, p.title AS post_title - FROM comments c - JOIN users u ON u.id = c.author_id - JOIN posts p ON p.id = c.post_id - WHERE p.site_id = ? AND c.status IN ('approved', 'rejected') - ORDER BY c.created_at DESC - LIMIT 30 - `).all(site.id); - - renderPage(req, res, 'pages/admin-comments', { - pageTitle: 'Comment moderation', - bodyClass: 'on-admin', - pending, - recent, - moderationMode: site.comments_moderation_mode || 'trust', - success: req.query.success || null, - error: req.query.error || null, - }); -}); - -function setStatus(req, res, status) { - const site = res.locals.site; - if (!site) return res.status(404).send('No site'); - const base = res.locals.siteUrlBase || ''; // /user/ in hub artist context, otherwise '' - - const row = db.prepare(` - SELECT c.id FROM comments c JOIN posts p ON p.id = c.post_id - WHERE c.id = ? AND p.site_id = ? - `).get(req.params.id, site.id); - - if (!row) return res.redirect(base + '/admin/comments?error=Not+found'); - - db.prepare( - 'UPDATE comments SET status = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?' - ).run(status, req.params.id); - res.redirect(base + '/admin/comments?success=' + encodeURIComponent('Comment ' + status)); -} - -router.post('/:id/approve', requireSiteManager, (req, res) => setStatus(req, res, 'approved')); -router.post('/:id/reject', requireSiteManager, (req, res) => setStatus(req, res, 'rejected')); - -export default router; Index: c/routes/comments.js =================================================================== --- src/routes/comments.js (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ (revision ) @@ -1,131 +1,0 @@ -/** - * Comments — phase G v1. - * - * POST /comments -> create a comment on a post (auth required) - * POST /comments/:id/delete -> delete (own, or god/site-admin) - * - * Threading: 1 level deep (top-level + replies). Replies-of-replies fold up - * into the same parent (UI keeps it shallow). - * - * Status: auto-approved for logged-in users (trust mode). The schema's - * `status` column stays so we can switch to moderation later without changing - * shape. Anonymous comments (require_login_to_comment = 0 + no user) come - * later — for now we always require login. - */ - -import express from 'express'; -import { v4 as uuid } from 'uuid'; -import db from '../config/database.js'; -import { requireAuth } from '../middleware/auth.js'; -import PermissionsService from '../services/PermissionsService.js'; -import { notify } from '../services/NotificationService.js'; - -const router = express.Router(); - -// Limits -const MAX_LEN = 4000; -const MIN_LEN = 1; - -router.post('/', requireAuth, (req, res) => { - const site = res.locals.site; - if (!site) return res.status(404).send('Site required'); - - const postSlug = (req.body.post_slug || '').trim(); - const rawContent = (req.body.content || '').trim(); - const parentId = (req.body.parent_comment_id || '').trim() || null; - - if (!postSlug) return res.status(400).send('post_slug required'); - if (rawContent.length < MIN_LEN) return res.status(400).send('Comment cannot be empty'); - if (rawContent.length > MAX_LEN) return res.status(413).send(`Comment too long (max ${MAX_LEN} chars)`); - - const post = db.prepare( - 'SELECT id, slug, title, author_id FROM posts WHERE site_id = ? AND slug = ? AND status = ?' - ).get(site.id, postSlug, 'published'); - if (!post) return res.status(404).send('Post not found'); - - if (!PermissionsService.canComment(req.session.user, site, post)) { - return res.status(403).send('Comments not allowed'); - } - - // Validate parent (must belong to this post; collapses replies-of-replies - // up to the top-level parent so we never go deeper than 1) - let resolvedParent = null; - let parentAuthorId = null; - if (parentId) { - const parent = db.prepare( - 'SELECT id, parent_comment_id, author_id FROM comments WHERE id = ? AND post_id = ?' - ).get(parentId, post.id); - if (!parent) return res.status(400).send('Invalid parent comment'); - resolvedParent = parent.parent_comment_id || parent.id; - parentAuthorId = parent.author_id; // recipient of the "reply" notification - } - - // Status depends on the site's moderation mode. - // 'trust' = auto-approve immediately (default). - // 'moderate' = pending until an admin reviews in /admin/comments. - // Author is the post author or god → always trusted (no point gatekeeping yourself). - const isTrustedAuthor = req.session.user.role === 'god' - || req.session.user.id === post.author_id; - const status = (site.comments_moderation_mode === 'moderate' && !isTrustedAuthor) - ? 'pending' - : 'approved'; - - const commentId = uuid(); - db.prepare(` - INSERT INTO comments (id, post_id, author_id, parent_comment_id, content, status) - VALUES (?, ?, ?, ?, ?, ?) - `).run(commentId, post.id, req.session.user.id, resolvedParent, rawContent, status); - - // Notification (only for visible comments): reply → author of the parent comment; - // top-level comment → author of the post. notify() skips self-notifications. - if (status === 'approved') { - const url = `${res.locals.siteUrlBase || ''}/${post.slug}#comment-${commentId}`; - const actorId = req.session.user.id; - const actorName = req.session.user.username; - if (parentId) { - notify({ userId: parentAuthorId, actorId, actorName, type: 'reply', postSlug: post.slug, postTitle: post.title, url }); - } else { - notify({ userId: post.author_id, actorId, actorName, type: 'comment', postSlug: post.slug, postTitle: post.title, url }); - } - } - - // Where to land after submit: - // approved → scroll to the new comment - // pending → comments anchor + ?pending=1 query so post page can flash a notice - const target = status === 'approved' - ? `${res.locals.siteUrlBase || ''}/${post.slug}#comment-${commentId}` - : `${res.locals.siteUrlBase || ''}/${post.slug}?pending=1#comments`; - if (req.headers['hx-request']) { - res.setHeader('HX-Redirect', target); - return res.send('OK'); - } - res.redirect(target); -}); - -router.post('/:id/delete', requireAuth, (req, res) => { - const site = res.locals.site; - if (!site) return res.status(404).send('Site required'); - - const comment = db.prepare(` - SELECT c.id, c.author_id, c.post_id, p.slug AS post_slug - FROM comments c JOIN posts p ON p.id = c.post_id - WHERE c.id = ? AND p.site_id = ? - `).get(req.params.id, site.id); - - if (!comment) return res.status(404).send('Not found'); - if (!PermissionsService.canDeleteComment(req.session.user, comment, site)) { - return res.status(403).send('No permission'); - } - - // Delete the comment plus any replies that hung off it - db.prepare('DELETE FROM comments WHERE id = ? OR parent_comment_id = ?') - .run(req.params.id, req.params.id); - - if (req.headers['hx-request']) { - res.setHeader('HX-Redirect', `${res.locals.siteUrlBase || ''}/${comment.post_slug}#comments`); - return res.send('OK'); - } - res.redirect(`${res.locals.siteUrlBase || ''}/${comment.post_slug}#comments`); -}); - -export default router; Index: src/routes/posts.js =================================================================== --- src/routes/posts.js (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/routes/posts.js (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -710,26 +710,6 @@ } - // Comments: top-level + replies. Two-pass build: fetch all approved - // comments for the post, then group replies under their parent. - const commentRows = db.prepare(` - SELECT c.id, c.parent_comment_id, c.content, c.status, c.created_at, - c.author_id, u.username AS author_username, - COALESCE(u.avatar_url, (SELECT profile_photo FROM sites WHERE owner_id = u.id AND profile_photo IS NOT NULL ORDER BY is_primary DESC, created_at ASC LIMIT 1)) AS author_avatar - FROM comments c JOIN users u ON u.id = c.author_id - WHERE c.post_id = ? AND c.status = 'approved' - ORDER BY c.created_at ASC - `).all(post.id); - const topLevel = []; - const repliesById = new Map(); - for (const c of commentRows) { - if (c.parent_comment_id) { - if (!repliesById.has(c.parent_comment_id)) repliesById.set(c.parent_comment_id, []); - repliesById.get(c.parent_comment_id).push(c); - } else { - topLevel.push(c); - } - } - for (const c of topLevel) c.replies = repliesById.get(c.id) || []; - const totalComments = commentRows.length; + // Native comments removed: social interaction is fediverse-only (see the + // "From the fediverse" section below). // Prev / next chronological (kept for back-compat — "post-nav" feature @@ -818,6 +798,4 @@ olderPost, relatedPosts, - comments: topLevel, - totalComments, fediverse, canManageSite, Index: src/server.js =================================================================== --- src/server.js (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/server.js (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -32,10 +32,8 @@ import adminSitesRoutes from './routes/admin-sites.js'; import adminUsersRoutes from './routes/admin-users.js'; -import adminCommentsRoutes from './routes/admin-comments.js'; import adminSettingsRoutes from './routes/admin-settings.js'; import adminSeoRoutes from './routes/admin-seo.js'; import audioRoutes from './routes/audio.js'; import searchRoutes from './routes/search.js'; -import commentsRoutes from './routes/comments.js'; import tagsRoutes from './routes/tags.js'; import typesRoutes from './routes/types.js'; @@ -305,5 +303,4 @@ app.use('/admin/sites', adminSitesRoutes); app.use('/admin/users', adminUsersRoutes); -app.use('/admin/comments', adminCommentsRoutes); app.use('/admin/settings', adminSettingsRoutes); app.use('/admin/seo', adminSeoRoutes); @@ -318,5 +315,4 @@ if (audioEnabled()) app.use('/audio', audioRoutes); app.use('/search', searchRoutes); -app.use('/comments', commentsRoutes); app.use('/tag', tagsRoutes); app.use('/type', typesRoutes); Index: c/views/pages/admin-comments.ejs =================================================================== --- src/views/pages/admin-comments.ejs (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ (revision ) @@ -1,128 +1,0 @@ -
-

← <%= t('acom.back') %>

-

<%= t('acom.title') %>

- -

- <%= t('acom.mode_for_site') %> <%= moderationMode %> - <% if (moderationMode === 'trust') { %> - — <%= t('acom.mode_trust_a') %> <%= t('acom.mode_moderate_word') %> - <%= t('acom.site_settings') %> <%= t('acom.mode_trust_b') %> - <% } else { %> - — <%= t('acom.mode_moderate_hint') %> - <% } %> -

- - <% if (success) { %>
<%= success %>
<% } %> - <% if (error) { %>
<%= error %>
<% } %> - -

<%= t('acom.pending', { n: pending.length }) %>

- <% if (!pending.length) { %> -

<%= t('acom.nothing_waiting') %>

- <% } else { %> - <% - var _c_reply = t('acom.reply'); - var _c_on = t('acom.on'); - var _c_approve = t('acom.approve'); - var _c_reject = t('acom.reject'); - %> -
    - <% pending.forEach(function(c) { %> -
  1. -
    - <%= c.author_username %> - <% if (c.parent_comment_id) { %>(<%= _c_reply %>)<% } %> - <%= _c_on %> <%= c.post_title || c.post_slug %> - · <%= formatDateTime(c.created_at) %> -
    -
    <%= c.content %>
    -
    -
    - -
    -
    - -
    -
    -
    2. - <% }); %> -
- <% } %> - -

<%= t('acom.recent') %>

- <% if (!recent.length) { %> -

<%= t('acom.nothing_yet') %>

- <% } else { %> - - <% } %> -
- - Index: src/views/pages/admin-site-edit.ejs =================================================================== --- src/views/pages/admin-site-edit.ejs (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/views/pages/admin-site-edit.ejs (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -147,15 +147,4 @@ > <%= t('asite.robots_index') %> - - - <% if (typeof audioEnabled === 'undefined' || audioEnabled) { %> Index: src/views/pages/admin.ejs =================================================================== --- src/views/pages/admin.ejs (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/views/pages/admin.ejs (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -31,5 +31,4 @@ <%= t('admin.b_playlists') %> <% } %> - <%= t('admin.b_comments') %> <% if (primarySite) { %><%= t('admin.b_seo') %><% } %> <%= t('admin.b_settings') %> @@ -39,5 +38,4 @@ <%= t('admin.b_audio') %> <% } %> - <%= t('admin.b_comments') %> <% if (primarySite) { %> <%= t('admin.b_look') %> Index: src/views/pages/my-site.ejs =================================================================== --- src/views/pages/my-site.ejs (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/views/pages/my-site.ejs (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -7,5 +7,4 @@ ✍️ <%= t('myst.new_post') %> 🎨 <%= t('myst.appearance') %> - 💬 <%= t('myst.comments') %> 👁️ <%= t('myst.view_site') %> 👤 <%= t('myst.account') %> Index: src/views/pages/post.ejs =================================================================== --- src/views/pages/post.ejs (revision 2e9773f664c16b98d6ebb6626b4e5a498f38c448) +++ src/views/pages/post.ejs (revision 59f017026eb35cc17dbb5f9fcf7cb3f5a9d9a538) @@ -112,159 +112,4 @@ - -
-

- <%= t(totalComments === 1 ? 'comments.heading_one' : 'comments.heading_other', { n: totalComments }) %> -

- - <% if (typeof currentPath === 'string' && currentPath && currentPath.indexOf('/' + post.slug) === 0) { %> - <% /* If the URL has ?pending=1, the previous submit landed in the moderation queue */ %> - <% } %> - - - <% if (!comments || !comments.length) { %> -

<%= t('comments.empty') %><% if (!user) { %> <%= t('nav.login') %> <%= t('comments.to_start') %><% } %>

- <% } else { %> -
    - <% comments.forEach(function(c) { %> -
  1. -
    - <% if (c.author_avatar) { %> - - <% } else { %> - <%= c.author_username.charAt(0).toUpperCase() %> - <% } %> -
    -
    -
    - <%= c.author_username %> - <%= formatDateTime(c.created_at) %> -
    -
    <%= c.content %>
    -
    - <% if (user && canMutate) { %> - - <% } %> - <% if (user && permissions.canDeleteComment(user, c, site)) { %> -
    - -
    - <% } %> -
    - - - <% if (user && canMutate) { %> - - <% } %> - - - <% if (c.replies && c.replies.length) { %> -
      - <% c.replies.forEach(function(r) { %> -
    1. -
      - <% if (r.author_avatar) { %> - - <% } else { %> - <%= r.author_username.charAt(0).toUpperCase() %> - <% } %> -
      -
      -
      - <%= r.author_username %> - <%= formatDateTime(r.created_at) %> -
      -
      <%= r.content %>
      -
      - <% if (user && canMutate) { %> - - <% } %> - <% if (user && permissions.canDeleteComment(user, r, site)) { %> -
      - -
      - <% } %> -
      - - <%# Replying to a reply — lands (via resolvedParent on the - server) in the same thread, so the 1-level depth is preserved. %> - <% if (user && canMutate) { %> - - <% } %> -
      -
      2. - <% }); %> -
    - <% } %> -
    -
    2. - <% }); %> -
- <% } %> - - - <% if (user && canMutate) { %> -
- - - -
- <% } else if (!user) { %> - - <% } else { %> - - <% } %> -
- - - <%# ── Related posts (3-card grid) ─────────────────────────────