Replace Option<bool> with bool for PostQuery and CommentQuery (#3819) (#3857)

[lemmy.git] / crates / api / src / post / save.rs

diff --git a/crates/api/src/post/save.rs b/crates/api/src/post/save.rs
index 973b99de9e422638b2d08361b68e8bf0f9557898..d9965dc756e0d07f223a25d8dd2161e596e9117e 100644 (file)
--- a/crates/api/src/post/save.rs
+++ b/crates/api/src/post/save.rs
@@ -1,32 +1,25 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
-  mark_post_as_read,
+  context::LemmyContext,
   post::{PostResponse, SavePost},
+  utils::{local_user_view_from_jwt, mark_post_as_read},
 };
 use lemmy_db_schema::{
   source::post::{PostSaved, PostSavedForm},
   traits::Saveable,
 };
-use lemmy_db_views::post_view::PostView;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views::structs::PostView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for SavePost {
   type Response = PostResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<PostResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostResponse, LemmyError> {
     let data: &SavePost = 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?;
 
     let post_saved_form = PostSavedForm {
       post_id: data.post_id,
@@ -34,26 +27,21 @@ impl Perform for SavePost {
     };
 
     if data.save {
-      let save = move |conn: &'_ _| PostSaved::save(conn, &post_saved_form);
-      blocking(context.pool(), save)
-        .await?
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_save_post"))?;
+      PostSaved::save(&mut context.pool(), &post_saved_form)
+        .await
+        .with_lemmy_type(LemmyErrorType::CouldntSavePost)?;
     } else {
-      let unsave = move |conn: &'_ _| PostSaved::unsave(conn, &post_saved_form);
-      blocking(context.pool(), unsave)
-        .await?
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_save_post"))?;
+      PostSaved::unsave(&mut context.pool(), &post_saved_form)
+        .await
+        .with_lemmy_type(LemmyErrorType::CouldntSavePost)?;
     }
 
     let post_id = data.post_id;
     let person_id = local_user_view.person.id;
-    let post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, post_id, Some(person_id))
-    })
-    .await??;
+    let post_view = PostView::read(&mut context.pool(), post_id, Some(person_id), false).await?;
 
     // Mark the post as read
-    mark_post_as_read(person_id, post_id, context.pool()).await?;
+    mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
 
     Ok(PostResponse { post_view })
   }