Rewrite some federation actions to remove Perform/SendActivity (ref #3670) (#3758)

[lemmy.git] / crates / api_crud / src / comment / delete.rs

diff --git a/crates/api_crud/src/comment/delete.rs b/crates/api_crud/src/comment/delete.rs
index 864daded8cad381e9ca6a43877928bd7ad2e3207..10063c66fb3e33dd60b2bbf49c9c36c70a7c638e 100644 (file)
--- a/crates/api_crud/src/comment/delete.rs
+++ b/crates/api_crud/src/comment/delete.rs
@@ -1,9 +1,10 @@
-use crate::PerformCrud;
-use actix_web::web::Data;
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
 use lemmy_api_common::{
   build_response::{build_comment_response, send_local_notifs},
   comment::{CommentResponse, DeleteComment},
   context::LemmyContext,
+  send_activity::{ActivityChannel, SendActivityData},
   utils::{check_community_ban, local_user_view_from_jwt},
 };
 use lemmy_db_schema::{
@@ -14,66 +15,76 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::CommentView;
-use lemmy_utils::error::LemmyError;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
-#[async_trait::async_trait(?Send)]
-impl PerformCrud for DeleteComment {
-  type Response = CommentResponse;
+#[tracing::instrument(skip(context))]
+pub async fn delete_comment(
+  data: Json<DeleteComment>,
+  context: Data<LemmyContext>,
+) -> Result<Json<CommentResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
 
-  #[tracing::instrument(skip(context))]
-  async fn perform(&self, context: &Data<LemmyContext>) -> Result<CommentResponse, LemmyError> {
-    let data: &DeleteComment = self;
-    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
+  let comment_id = data.comment_id;
+  let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
 
-    let comment_id = data.comment_id;
-    let orig_comment = CommentView::read(context.pool(), comment_id, None).await?;
+  // Dont delete it if its already been deleted.
+  if orig_comment.comment.deleted == data.deleted {
+    return Err(LemmyErrorType::CouldntUpdateComment)?;
+  }
 
-    // Dont delete it if its already been deleted.
-    if orig_comment.comment.deleted == data.deleted {
-      return Err(LemmyError::from_message("couldnt_update_comment"));
-    }
+  check_community_ban(
+    local_user_view.person.id,
+    orig_comment.community.id,
+    &mut context.pool(),
+  )
+  .await?;
 
-    check_community_ban(
-      local_user_view.person.id,
-      orig_comment.community.id,
-      context.pool(),
-    )
-    .await?;
+  // Verify that only the creator can delete
+  if local_user_view.person.id != orig_comment.creator.id {
+    return Err(LemmyErrorType::NoCommentEditAllowed)?;
+  }
 
-    // Verify that only the creator can delete
-    if local_user_view.person.id != orig_comment.creator.id {
-      return Err(LemmyError::from_message("no_comment_edit_allowed"));
-    }
+  // Do the delete
+  let deleted = data.deleted;
+  let updated_comment = Comment::update(
+    &mut context.pool(),
+    comment_id,
+    &CommentUpdateForm::builder().deleted(Some(deleted)).build(),
+  )
+  .await
+  .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
 
-    // Do the delete
-    let deleted = data.deleted;
-    let updated_comment = Comment::update(
-      context.pool(),
-      comment_id,
-      &CommentUpdateForm::builder().deleted(Some(deleted)).build(),
-    )
-    .await
-    .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
+  let post_id = updated_comment.post_id;
+  let post = Post::read(&mut context.pool(), post_id).await?;
+  let recipient_ids = send_local_notifs(
+    vec![],
+    &updated_comment,
+    &local_user_view.person,
+    &post,
+    false,
+    &context,
+  )
+  .await?;
+  let updated_comment_id = updated_comment.id;
 
-    let post_id = updated_comment.post_id;
-    let post = Post::read(context.pool(), post_id).await?;
-    let recipient_ids = send_local_notifs(
-      vec![],
-      &updated_comment,
-      &local_user_view.person,
-      &post,
-      false,
-      context,
-    )
-    .await?;
+  ActivityChannel::submit_activity(
+    SendActivityData::DeleteComment(
+      updated_comment,
+      local_user_view.person.clone(),
+      orig_comment.community,
+    ),
+    &context,
+  )
+  .await?;
 
+  Ok(Json(
     build_comment_response(
-      context,
-      updated_comment.id,
+      &context,
+      updated_comment_id,
       Some(local_user_view),
       None,
       recipient_ids,
     )
-    .await
-  }
+    .await?,
+  ))
 }