Remove Children

api_tests/package.json

@@ -33,7 +33,7 @@
     "eslint-plugin-prettier": "^5.5.0",
     "jest": "^30.0.0",
     "joi": "^18.0.0",
-    "lemmy-js-client": "1.0.0-rename-community-tag.0",
+    "lemmy-js-client": "1.0.0-remove-children.0",
     "lemmy-js-client-019": "npm:lemmy-js-client@0.19.9",
     "prettier": "^3.5.3",
     "ts-jest": "^29.4.0",

api_tests/src/comment.spec.ts

@@ -23,6 +23,7 @@ import {
   reportComment,
   randomString,
   unfollows,
+  getComment,
   getComments,
   getCommentParentId,
   resolveCommunity,
@@ -981,6 +982,65 @@ test("Lock comment", async () => {
   ).toBeDefined();
 });
 
+test("Remove children", async () => {
+  const alphaCommunity = await resolveCommunity(
+    alpha,
+    "!main@lemmy-alpha:8541",
+  );
+  if (!alphaCommunity) {
+    throw "Missing alpha community";
+  }
+
+  let post = await createPost(alpha, alphaCommunity.community.id);
+  let betaPost = await resolvePost(beta, post.post_view.post);
+
+  if (!betaPost) {
+    throw "unable to locate post on beta";
+  }
+  await followCommunity(beta, true, betaPost.community.id);
+
+  let comment1 = await createComment(beta, betaPost.post.id);
+  let comment2 = await createComment(
+    beta,
+    betaPost.post.id,
+    comment1.comment_view.comment.id,
+  );
+  await createComment(beta, betaPost.post.id, comment2.comment_view.comment.id);
+  await createComment(beta, betaPost.post.id, comment1.comment_view.comment.id);
+
+  // Wait until the comments have federated
+  await waitUntil(
+    () => getPost(alpha, post.post_view.post.id),
+    p => p.post_view.post.comments == 4,
+  );
+
+  let commentOnAlpha = await resolveComment(
+    alpha,
+    comment1.comment_view.comment,
+  );
+  if (!commentOnAlpha) {
+    throw "unable to locate comment on alpha";
+  }
+
+  await removeComment(alpha, true, commentOnAlpha.comment.id, true);
+
+  let post2 = await getPost(alpha, post.post_view.post.id);
+  expect(post2.post_view.post.comments).toBe(0);
+
+  // Wait until the remove has federated
+  await waitUntil(
+    () => getComment(beta, comment1.comment_view.comment.id),
+    c => c.comment_view.comment.removed,
+  );
+
+  // Make sure removal federates properly
+  let betaPost2 = await resolvePost(beta, post.post_view.post);
+  if (!betaPost2) {
+    throw "unable to locate post on beta";
+  }
+  expect(betaPost2.post.comments).toBe(0);
+});
+
 function checkCommentReportReason(rcv: ReportCombinedView, reason: string) {
   switch (rcv.type_) {
     case "comment":

api_tests/src/shared.ts

@@ -53,6 +53,7 @@ import {
   EditSite,
   FeaturePost,
   FollowCommunity,
+  GetComment,
   GetComments,
   GetCommunity,
   GetCommunityResponse,
@@ -381,6 +382,16 @@ export async function lockComment(
   return api.lockComment(form);
 }
 
+export async function getComment(
+  api: LemmyHttp,
+  comment_id: number,
+): Promise<CommentResponse> {
+  let form: GetComment = {
+    id: comment_id,
+  };
+  return api.getComment(form);
+}
+
 export async function getComments(
   api: LemmyHttp,
   post_id?: number,
@@ -575,11 +586,13 @@ export async function removeComment(
   api: LemmyHttp,
   removed: boolean,
   comment_id: number,
+  remove_children?: boolean,
 ): Promise<CommentResponse> {
   let form: RemoveComment = {
     comment_id,
     removed,
     reason: "remove",
+    remove_children,
   };
   return api.removeComment(form);
 }

crates/api/api/src/site/purge/comment.rs

@@ -63,6 +63,7 @@ pub async fn purge_comment(
       moderator: local_user_view.person.clone(),
       community: comment_view.community,
       reason: data.reason.clone(),
+      with_replies: false,
     },
     &context,
   )?;

crates/api/api/src/site/purge/post.rs

@@ -50,6 +50,7 @@ pub async fn purge_post(
       moderator: local_user_view.person.clone(),
       reason: data.reason.clone(),
       removed: true,
+      with_replies: false,
     },
     &context,
   )?;

crates/api/api_crud/src/comment/remove.rs

@@ -55,36 +55,83 @@ pub async fn remove_comment(
   )
   .await?;
 
-  // Don't allow removing or restoring comment which was deleted by user, as it would reveal
-  // the comment text in mod log.
-  if orig_comment.comment.deleted {
-    return Err(LemmyErrorType::CouldntUpdate.into());
-  }
-
-  // Do the remove
-  let removed = data.removed;
-  let updated_comment = Comment::update(
-    &mut context.pool(),
-    comment_id,
-    &CommentUpdateForm {
-      removed: Some(removed),
-      ..Default::default()
-    },
-  )
-  .await?;
+  let updated_comment = if let Some(remove_children) = data.remove_children {
+    let updated_comments: Vec<Comment> = Comment::update_removed_for_comment_and_children(
+      &mut context.pool(),
+      &orig_comment.comment.path,
+      remove_children,
+    )
+    .await?;
+
+    let updated_comment = updated_comments
+      .iter()
+      .find(|c| c.id == comment_id)
+      .ok_or(LemmyErrorType::CouldntUpdate)?
+      .clone();
+
+    let forms: Vec<_> = updated_comments
+      .iter()
+      // Filter out deleted comments here so their content doesn't show up in the modlog.
+      .filter(|c| !c.deleted)
+      .map(|comment| {
+        ModlogInsertForm::mod_remove_comment(
+          local_user_view.person.id,
+          comment,
+          remove_children,
+          &data.reason,
+        )
+      })
+      .collect();
+
+    let actions = Modlog::create(&mut context.pool(), &forms).await?;
+    notify_mod_action(actions, &context);
 
-  CommentReport::resolve_all_for_object(&mut context.pool(), comment_id, local_user_view.person.id)
+    CommentReport::resolve_all_for_thread(
+      &mut context.pool(),
+      &orig_comment.comment.path,
+      local_user_view.person.id,
+    )
     .await?;
 
-  // Mod tables
-  let form = ModlogInsertForm::mod_remove_comment(
-    local_user_view.person.id,
-    &orig_comment.comment,
-    removed,
-    &data.reason,
-  );
-  let actions = Modlog::create(&mut context.pool(), &[form]).await?;
-  notify_mod_action(actions, context.app_data());
+    updated_comment
+  } else {
+    // Don't allow removing or restoring comment which was deleted by user, as it would reveal
+    // the comment text in mod log.
+    if orig_comment.comment.deleted {
+      return Err(LemmyErrorType::CouldntUpdate.into());
+    }
+
+    // Do the remove
+    let removed = data.removed;
+    let updated_comment = Comment::update(
+      &mut context.pool(),
+      comment_id,
+      &CommentUpdateForm {
+        removed: Some(removed),
+        ..Default::default()
+      },
+    )
+    .await?;
+
+    CommentReport::resolve_all_for_object(
+      &mut context.pool(),
+      comment_id,
+      local_user_view.person.id,
+    )
+    .await?;
+
+    // Mod tables
+    let form = ModlogInsertForm::mod_remove_comment(
+      local_user_view.person.id,
+      &orig_comment.comment,
+      removed,
+      &data.reason,
+    );
+    let actions = Modlog::create(&mut context.pool(), &[form]).await?;
+    notify_mod_action(actions, context.app_data());
+
+    updated_comment
+  };
 
   let updated_comment_id = updated_comment.id;
 
@@ -94,6 +141,7 @@ pub async fn remove_comment(
       moderator: local_user_view.person.clone(),
       community: orig_comment.community,
       reason: data.reason.clone(),
+      with_replies: data.remove_children.unwrap_or_default(),
     },
     &context,
   )?;

crates/api/api_crud/src/post/remove.rs

@@ -9,6 +9,8 @@ use lemmy_api_utils::{
 };
 use lemmy_db_schema::{
   source::{
+    comment::Comment,
+    comment_report::CommentReport,
     community::Community,
     local_user::LocalUser,
     modlog::{Modlog, ModlogInsertForm},
@@ -28,6 +30,7 @@ pub async fn remove_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
+  let removed = data.remove_children.unwrap_or(data.removed);
 
   // We cannot use PostView to avoid a database read here, as it doesn't return removed items
   // by default. So we would have to pass in `is_mod_or_admin`, but that is impossible without
@@ -46,8 +49,6 @@ pub async fn remove_post(
   .await?;
 
   // Update the post
-  let post_id = data.post_id;
-  let removed = data.removed;
   let post = Post::update(
     &mut context.pool(),
     post_id,
@@ -67,15 +68,41 @@ pub async fn remove_post(
   let action = Modlog::create(&mut context.pool(), &[form]).await?;
   notify_mod_action(action, context.app_data());
 
+  if data.remove_children.is_some() {
+    let updated_comments: Vec<Comment> =
+      Comment::update_removed_for_post(&mut context.pool(), post_id, removed).await?;
+
+    let forms: Vec<_> = updated_comments
+      .iter()
+      // Filter out deleted comments here so their content doesn't show up in the modlog.
+      .filter(|c| !c.deleted)
+      .map(|comment| {
+        ModlogInsertForm::mod_remove_comment(
+          local_user_view.person.id,
+          comment,
+          removed,
+          &data.reason,
+        )
+      })
+      .collect();
+
+    let actions = Modlog::create(&mut context.pool(), &forms).await?;
+    notify_mod_action(actions, &context);
+
+    CommentReport::resolve_all_for_post(&mut context.pool(), post.id, local_user_view.person.id)
+      .await?;
+  }
+
   ActivityChannel::submit_activity(
     SendActivityData::RemovePost {
       post,
       moderator: local_user_view.person.clone(),
       reason: data.reason.clone(),
-      removed: data.removed,
+      removed,
+      with_replies: data.remove_children.unwrap_or_default(),
     },
     &context,
   )?;
 
-  build_post_response(&context, orig_post.community_id, local_user_view, post_id).await
+  build_post_response(&context, community.id, local_user_view, post_id).await
 }

crates/api/api_utils/src/send_activity.rs

@@ -39,6 +39,7 @@ pub enum SendActivityData {
     moderator: Person,
     reason: String,
     removed: bool,
+    with_replies: bool,
   },
   LockPost(Post, Person, bool, String),
   FeaturePost(Post, Person, bool),
@@ -50,6 +51,7 @@ pub enum SendActivityData {
     moderator: Person,
     community: Community,
     reason: String,
+    with_replies: bool,
   },
   LockComment(Comment, Person, bool, String),
   LikePostOrComment {