First pass at adding comment trees. (#2362)

[lemmy.git] / crates / api / src / local_user / notifications / list_mentions.rs

diff --git a/crates/api/src/local_user/notifications/list_mentions.rs b/crates/api/src/local_user/notifications/list_mentions.rs
index f47d3cc77c82a13fde9755c85b36c2a18dcf45b3..0d43e61435a547d6e2e735560c818abadbe287d6 100644 (file)
--- a/crates/api/src/local_user/notifications/list_mentions.rs
+++ b/crates/api/src/local_user/notifications/list_mentions.rs
@@ -1,13 +1,11 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
   person::{GetPersonMentions, GetPersonMentionsResponse},
+  utils::{blocking, get_local_user_view_from_jwt},
 };
-use lemmy_db_schema::{from_opt_str_to_opt_enum, SortType};
 use lemmy_db_views_actor::person_mention_view::PersonMentionQueryBuilder;
-use lemmy_utils::{ConnectionId, LemmyError};
+use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::LemmyContext;
 
 #[async_trait::async_trait(?Send)]
@@ -24,18 +22,20 @@ impl Perform for GetPersonMentions {
     let local_user_view =
       get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
 
-    let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
-
+    let sort = data.sort;
     let page = data.page;
     let limit = data.limit;
     let unread_only = data.unread_only;
     let person_id = local_user_view.person.id;
+    let show_bot_accounts = local_user_view.local_user.show_bot_accounts;
+
     let mentions = blocking(context.pool(), move |conn| {
       PersonMentionQueryBuilder::create(conn)
         .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)
         .list()