]> Untitled Git - lemmy.git/blobdiff - crates/api_crud/src/private_message/delete.rs
Implement reports for private messages (#2433)
[lemmy.git] / crates / api_crud / src / private_message / delete.rs
index f11e9657c7ba71e916e628b519ea36207bc94a9c..e7d6702022b826201a54e1e5171fb14f65f4b4e7 100644 (file)
@@ -1,13 +1,12 @@
 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::activities::deletion::send_apub_delete_private_message;
 use lemmy_db_schema::{source::private_message::PrivateMessage, traits::Crud};
-use lemmy_utils::{ConnectionId, LemmyError};
+use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperationCrud};
 
 #[async_trait::async_trait(?Send)]
@@ -41,8 +40,7 @@ impl PerformCrud for DeletePrivateMessage {
       PrivateMessage::update_deleted(conn, private_message_id, deleted)
     })
     .await?
-    .map_err(LemmyError::from)
-    .map_err(|e| e.with_message("couldnt_update_private_message"))?;
+    .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
 
     // Send the apub update
     send_apub_delete_private_message(