Implement reports for private messages (#2433)

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

diff --git a/crates/api_crud/src/private_message/delete.rs b/crates/api_crud/src/private_message/delete.rs
index 06bc22edeec6eb75f93447d89ec7bd272fa3c4b3..e7d6702022b826201a54e1e5171fb14f65f4b4e7 100644 (file)
--- a/crates/api_crud/src/private_message/delete.rs
+++ b/crates/api_crud/src/private_message/delete.rs
@@ -1,25 +1,19 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
-  person::{DeletePrivateMessage, PrivateMessageResponse},
+  private_message::{DeletePrivateMessage, PrivateMessageResponse},
+  utils::{blocking, get_local_user_view_from_jwt},
 };
-use lemmy_apub::protocol::activities::private_message::{
-  delete::DeletePrivateMessage as DeletePrivateMessageApub,
-  undo_delete::UndoDeletePrivateMessage,
-};
-use lemmy_db_schema::{
-  source::private_message::PrivateMessage,
-  traits::{Crud, DeleteableOrRemoveable},
-};
-use lemmy_utils::{ApiError, ConnectionId, LemmyError};
+use lemmy_apub::activities::deletion::send_apub_delete_private_message;
+use lemmy_db_schema::{source::private_message::PrivateMessage, traits::Crud};
+use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperationCrud};
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for DeletePrivateMessage {
   type Response = PrivateMessageResponse;
 
+  #[tracing::instrument(skip(self, context, websocket_id))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
@@ -36,7 +30,7 @@ impl PerformCrud for DeletePrivateMessage {
     })
     .await??;
     if local_user_view.person.id != orig_private_message.creator_id {
-      return Err(ApiError::err_plain("no_private_message_edit_allowed").into());
+      return Err(LemmyError::from_message("no_private_message_edit_allowed"));
     }
 
     // Doing the update
@@ -46,26 +40,16 @@ impl PerformCrud for DeletePrivateMessage {
       PrivateMessage::update_deleted(conn, private_message_id, deleted)
     })
     .await?
-    .map_err(|e| ApiError::err("couldnt_update_private_message", e))?;
+    .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
 
     // Send the apub update
-    if data.deleted {
-      DeletePrivateMessageApub::send(
-        &local_user_view.person.into(),
-        &updated_private_message
-          .blank_out_deleted_or_removed_info()
-          .into(),
-        context,
-      )
-      .await?;
-    } else {
-      UndoDeletePrivateMessage::send(
-        &local_user_view.person.into(),
-        &updated_private_message.into(),
-        context,
-      )
-      .await?;
-    }
+    send_apub_delete_private_message(
+      &local_user_view.person.into(),
+      updated_private_message,
+      data.deleted,
+      context,
+    )
+    .await?;
 
     let op = UserOperationCrud::DeletePrivateMessage;
     send_pm_ws_message(data.private_message_id, op, websocket_id, context).await