Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / api / src / private_message / mark_read.rs

diff --git a/crates/api/src/private_message/mark_read.rs b/crates/api/src/private_message/mark_read.rs
index d46280bdebdec1e19bde4f62bc4f96723fafffb7..cca37fde4f2ae1486b44104e82d8f01a60210f86 100644 (file)
--- a/crates/api/src/private_message/mark_read.rs
+++ b/crates/api/src/private_message/mark_read.rs
@@ -1,49 +1,51 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
-  person::{MarkPrivateMessageAsRead, PrivateMessageResponse},
+  context::LemmyContext,
+  private_message::{MarkPrivateMessageAsRead, PrivateMessageResponse},
+  utils::local_user_view_from_jwt,
 };
-use lemmy_db_schema::{source::private_message::PrivateMessage, traits::Crud};
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperation};
+use lemmy_db_schema::{
+  source::private_message::{PrivateMessage, PrivateMessageUpdateForm},
+  traits::Crud,
+};
+use lemmy_db_views::structs::PrivateMessageView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for MarkPrivateMessageAsRead {
   type Response = PrivateMessageResponse;
 
-  #[tracing::instrument(skip(context, websocket_id))]
+  #[tracing::instrument(skip(context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &MarkPrivateMessageAsRead = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
     // Checking permissions
     let private_message_id = data.private_message_id;
-    let orig_private_message = blocking(context.pool(), move |conn| {
-      PrivateMessage::read(conn, private_message_id)
-    })
-    .await??;
+    let orig_private_message =
+      PrivateMessage::read(&mut context.pool(), private_message_id).await?;
     if local_user_view.person.id != orig_private_message.recipient_id {
-      return Err(LemmyError::from_message("couldnt_update_private_message"));
+      return Err(LemmyErrorType::CouldntUpdatePrivateMessage)?;
     }
 
     // Doing the update
     let private_message_id = data.private_message_id;
     let read = data.read;
-    blocking(context.pool(), move |conn| {
-      PrivateMessage::update_read(conn, private_message_id, read)
-    })
-    .await?
-    .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
+    PrivateMessage::update(
+      &mut context.pool(),
+      private_message_id,
+      &PrivateMessageUpdateForm::builder().read(Some(read)).build(),
+    )
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
 
-    // No need to send an apub update
-    let op = UserOperation::MarkPrivateMessageAsRead;
-    send_pm_ws_message(data.private_message_id, op, websocket_id, context).await
+    let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
+    Ok(PrivateMessageResponse {
+      private_message_view: view,
+    })
   }
 }