Removed comment tombstone serialization

apps/comments-ui/src/app-context.ts

@@ -27,7 +27,7 @@ export type Comment = {
     member: Member | null,
     edited_at: string,
     created_at: string,
-    html: string
+    html: string | null
 }
 
 export type OpenCommentForm = {

ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/comments.js

@@ -48,25 +48,6 @@ const commentMapper = (model, frame) => {
 
     const isPublicRequest = utils.isMembersAPI(frame);
 
-    // Deleted comments are tombstones - just enough info to show "Reply to deleted comment"
-    if (jsonModel.status === 'deleted') {
-        const tombstone = {
-            id: jsonModel.id,
-            parent_id: jsonModel.parent_id || null,
-            status: 'deleted'
-        };
-        // Include post relation if loaded
-        if (jsonModel.post) {
-            url.forPost(jsonModel.post.id, jsonModel.post, frame);
-            tombstone.post = _.pick(jsonModel.post, postFields);
-        }
-        // Include replies if present (for tree structure), recursively mapped
-        if (jsonModel.replies) {
-            tombstone.replies = jsonModel.replies.map(reply => commentMapper(reply, frame));
-        }
-        return tombstone;
-    }
-
     if (jsonModel.inReplyTo && (jsonModel.inReplyTo.status === 'published' || (!isPublicRequest && jsonModel.inReplyTo.status === 'hidden'))) {
         jsonModel.in_reply_to_snippet = htmlToPlaintext.commentSnippet(jsonModel.inReplyTo.html);
     } else if (jsonModel.inReplyTo && jsonModel.inReplyTo.status !== 'published') {
@@ -115,6 +96,11 @@ const commentMapper = (model, frame) => {
         }
     }
 
+    // Deleted comments should never expose their content
+    if (jsonModel.status === 'deleted') {
+        response.html = null;
+    }
+
     return response;
 };
 

ghost/core/core/server/models/comment.js

@@ -63,18 +63,24 @@ const Comment = ghostBookshelf.Model.extend({
 
     // Called by our filtered-collection bookshelf plugin
     applyCustomQuery(options) {
-        const excludedCommentStatuses = options.isAdmin ? ['deleted'] : ['hidden', 'deleted'];
+        const excludedStatuses = options.isAdmin ? ['deleted'] : ['hidden', 'deleted'];
 
         this.query((qb) => {
-            qb.where(function () {
-                this.whereNotIn('comments.status', excludedCommentStatuses)
-                    .orWhereExists(function () {
-                        this.select(1)
-                            .from('comments as replies')
-                            .whereRaw('replies.parent_id = comments.id')
-                            .whereNotIn('replies.status', excludedCommentStatuses);
-                    });
-            });
+            if (options.browseAll) {
+                // Browse All: simply exclude statuses, no thread structure preservation
+                qb.whereNotIn('comments.status', excludedStatuses);
+            } else {
+                // Default: preserve thread structure by including deleted parents with replies
+                qb.where(function () {
+                    this.whereNotIn('comments.status', excludedStatuses)
+                        .orWhereExists(function () {
+                            this.select(1)
+                                .from('comments as replies')
+                                .whereRaw('replies.parent_id = comments.id')
+                                .whereNotIn('replies.status', excludedStatuses);
+                        });
+                });
+            }
         });
     },
 
@@ -317,9 +323,9 @@ const Comment = ghostBookshelf.Model.extend({
      */
     permittedOptions: function permittedOptions(methodName) {
         let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
-        // The comment model additionally supports having a parentId and isAdmin option
         options.push('parentId');
         options.push('isAdmin');
+        options.push('browseAll');
 
         return options;
     }

ghost/core/core/server/services/comments/CommentsService.js

@@ -202,16 +202,15 @@ class CommentsService {
             order,
             page,
             limit,
-            // If includeNested is false, only return top-level comments
             parentId: includeNested ? undefined : null,
-            // Admin context: see hidden comments with full content, and all statuses including deleted
-            isAdmin: true
+            isAdmin: true,
+            browseAll: true
         });
     }
 
     async getAdminComments(options) {
         this.checkEnabled();
-        const page = await this.models.Comment.findPage({...options, parentId: null});
+        const page = await this.models.Comment.findPage({...options, parentId: null, isAdmin: true});
 
         return page;
     }