Check if post or comment are deleted first. Fixes #1864

crates/api_crud/src/comment/delete.rs

@@ -44,6 +44,11 @@ impl PerformCrud for DeleteComment {
     })
     .await??;
 
+    // Dont delete it if its already been deleted.
+    if orig_comment.comment.deleted == data.deleted {
+      return Err(ApiError::err_plain("couldnt_update_comment").into());
+    }
+
     check_community_ban(
       local_user_view.person.id,
       orig_comment.community.id,

crates/api_crud/src/post/delete.rs

@@ -36,6 +36,11 @@ impl PerformCrud for DeletePost {
     let post_id = data.post_id;
     let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
 
+    // Dont delete it if its already been deleted.
+    if orig_post.deleted == data.deleted {
+      return Err(ApiError::err_plain("couldnt_update_post").into());
+    }
+
     check_community_ban(
       local_user_view.person.id,
       orig_post.community_id,

crates/apub/src/activities/deletion/mod.rs

@@ -175,13 +175,16 @@ async fn receive_delete_action(
       send_community_ws_message(community.id, ws_messages.community, None, None, context).await?;
     }
     DeletableObjects::Post(post) => {
+      if deleted != post.deleted {
         let deleted_post = blocking(context.pool(), move |conn| {
           Post::update_deleted(conn, post.id, deleted)
         })
         .await??;
         send_post_ws_message(deleted_post.id, ws_messages.post, None, None, context).await?;
       }
+    }
     DeletableObjects::Comment(comment) => {
+      if deleted != comment.deleted {
         let deleted_comment = blocking(context.pool(), move |conn| {
           Comment::update_deleted(conn, comment.id, deleted)
         })
@@ -189,5 +192,6 @@ async fn receive_delete_action(
         send_comment_ws_message_simple(deleted_comment.id, ws_messages.comment, context).await?;
       }
     }
+  }
   Ok(())
 }

crates/apub/src/objects/comment.rs

@@ -81,10 +81,12 @@ impl ApubObject for ApubComment {
   }
 
   async fn delete(self, context: &LemmyContext) -> Result<(), LemmyError> {
+    if !self.deleted {
       blocking(context.pool(), move |conn| {
         Comment::update_deleted(conn, self.id, true)
       })
       .await??;
+    }
     Ok(())
   }
 

crates/apub/src/objects/post.rs

@@ -76,10 +76,12 @@ impl ApubObject for ApubPost {
   }
 
   async fn delete(self, context: &LemmyContext) -> Result<(), LemmyError> {
+    if !self.deleted {
       blocking(context.pool(), move |conn| {
         Post::update_deleted(conn, self.id, true)
       })
       .await??;
+    }
     Ok(())
   }