X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fpost%2Fmark_read.rs;h=99f539a92e987f61221ed91fcd5ca77627939858;hb=c8063f3267cf2b3622f1fdc69128c6b55feefbbc;hp=9fdf01b1281a4a44c15100a144594ffa3781e8ed;hpb=f02892b23b865e4e29b04c441754f87b4522077d;p=lemmy.git diff --git a/crates/api/src/post/mark_read.rs b/crates/api/src/post/mark_read.rs index 9fdf01b1..99f539a9 100644 --- a/crates/api/src/post/mark_read.rs +++ b/crates/api/src/post/mark_read.rs @@ -3,40 +3,33 @@ use actix_web::web::Data; use lemmy_api_common::{ context::LemmyContext, post::{MarkPostAsRead, PostResponse}, - utils::{get_local_user_view_from_jwt, mark_post_as_read, mark_post_as_unread}, + 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, - _websocket_id: Option, - ) -> Result { + #[tracing::instrument(skip(context))] + async fn perform(&self, context: &Data) -> Result { let data = 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_id = data.post_id; let person_id = local_user_view.person.id; // 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)).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 }) } }