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

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

diff --git a/crates/api/src/post/mark_read.rs b/crates/api/src/post/mark_read.rs
index e53d7a78ffbfb33f896100b997dbc36a55ad29b0..99f539a92e987f61221ed91fcd5ca77627939858 100644 (file)
--- a/crates/api/src/post/mark_read.rs
+++ b/crates/api/src/post/mark_read.rs
@@ -6,18 +6,14 @@ use lemmy_api_common::{
   utils::{local_user_view_from_jwt, mark_post_as_read, mark_post_as_unread},
 };
 use lemmy_db_views::structs::PostView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for MarkPostAsRead {
   type Response = PostResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let data = self;
     let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
@@ -26,16 +22,14 @@ impl Perform for MarkPostAsRead {
 
     // Mark the post as read / unread
     if data.read {
-      mark_post_as_read(person_id, post_id, context.pool()).await?;
+      mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
     } else {
-      mark_post_as_unread(person_id, post_id, context.pool()).await?;
+      mark_post_as_unread(person_id, post_id, &mut context.pool()).await?;
     }
 
     // Fetch it
-    let post_view = PostView::read(context.pool(), post_id, Some(person_id), None).await?;
+    let post_view = PostView::read(&mut context.pool(), post_id, Some(person_id), false).await?;
 
-    let res = Self::Response { post_view };
-
-    Ok(res)
+    Ok(Self::Response { post_view })
   }
 }