use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
- blocking,
- get_local_user_view_from_jwt,
+ context::LemmyContext,
person::{MarkPersonMentionAsRead, PersonMentionResponse},
+ utils::local_user_view_from_jwt,
};
-use lemmy_db_schema::{source::person_mention::PersonMention, traits::Crud};
-use lemmy_db_views_actor::person_mention_view::PersonMentionView;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_schema::{
+ source::person_mention::{PersonMention, PersonMentionUpdateForm},
+ traits::Crud,
+};
+use lemmy_db_views_actor::structs::PersonMentionView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
#[async_trait::async_trait(?Send)]
impl Perform for MarkPersonMentionAsRead {
type Response = PersonMentionResponse;
- #[tracing::instrument(skip(context, _websocket_id))]
+ #[tracing::instrument(skip(context))]
async fn perform(
&self,
context: &Data<LemmyContext>,
- _websocket_id: Option<ConnectionId>,
) -> Result<PersonMentionResponse, LemmyError> {
let data: &MarkPersonMentionAsRead = 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 person_mention_id = data.person_mention_id;
- let read_person_mention = blocking(context.pool(), move |conn| {
- PersonMention::read(conn, person_mention_id)
- })
- .await??;
+ let read_person_mention = PersonMention::read(&mut context.pool(), person_mention_id).await?;
if local_user_view.person.id != read_person_mention.recipient_id {
- return Err(LemmyError::from_message("couldnt_update_comment"));
+ return Err(LemmyErrorType::CouldntUpdateComment)?;
}
let person_mention_id = read_person_mention.id;
- let read = data.read;
- let update_mention =
- move |conn: &'_ _| PersonMention::update_read(conn, person_mention_id, read);
- blocking(context.pool(), update_mention)
- .await?
- .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_comment"))?;
+ let read = Some(data.read);
+ PersonMention::update(
+ &mut context.pool(),
+ person_mention_id,
+ &PersonMentionUpdateForm { read },
+ )
+ .await
+ .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
let person_mention_id = read_person_mention.id;
let person_id = local_user_view.person.id;
- let person_mention_view = blocking(context.pool(), move |conn| {
- PersonMentionView::read(conn, person_mention_id, Some(person_id))
- })
- .await??;
+ let person_mention_view =
+ PersonMentionView::read(&mut context.pool(), person_mention_id, Some(person_id)).await?;
Ok(PersonMentionResponse {
person_mention_view,