utils::local_user_view_from_jwt,
};
use lemmy_db_views_actor::person_mention_view::PersonMentionQuery;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::LemmyError;
#[async_trait::async_trait(?Send)]
impl Perform for GetPersonMentions {
type Response = GetPersonMentionsResponse;
- #[tracing::instrument(skip(context, _websocket_id))]
+ #[tracing::instrument(skip(context))]
async fn perform(
&self,
context: &Data<LemmyContext>,
- _websocket_id: Option<ConnectionId>,
) -> Result<GetPersonMentionsResponse, LemmyError> {
let data: &GetPersonMentions = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let sort = data.sort;
let page = data.page;
let limit = data.limit;
- let unread_only = data.unread_only;
+ let unread_only = data.unread_only.unwrap_or_default();
let person_id = Some(local_user_view.person.id);
- let show_bot_accounts = Some(local_user_view.local_user.show_bot_accounts);
+ let show_bot_accounts = local_user_view.local_user.show_bot_accounts;
- let mentions = PersonMentionQuery::builder()
- .pool(context.pool())
- .recipient_id(person_id)
- .my_person_id(person_id)
- .sort(sort)
- .unread_only(unread_only)
- .show_bot_accounts(show_bot_accounts)
- .page(page)
- .limit(limit)
- .build()
- .list()
- .await?;
+ let mentions = PersonMentionQuery {
+ recipient_id: person_id,
+ my_person_id: person_id,
+ sort,
+ unread_only,
+ show_bot_accounts,
+ page,
+ limit,
+ }
+ .list(&mut context.pool())
+ .await?;
Ok(GetPersonMentionsResponse { mentions })
}