Merge branch 'main' into feature/mark_post_as_read

[lemmy.git] / crates / api_crud / src / user / read.rs

diff --git a/crates/api_crud/src/user/read.rs b/crates/api_crud/src/user/read.rs
index 39431128aee3d70846a5278ff5bb2425b9d84907..132bdd78f4e32d633332f098b97fac9b081aea14 100644 (file)
--- a/crates/api_crud/src/user/read.rs
+++ b/crates/api_crud/src/user/read.rs
@@ -1,12 +1,6 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
-use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt_opt,
-  person::*,
-  user_show_bot_accounts,
-  user_show_nsfw,
-};
+use lemmy_api_common::{blocking, get_local_user_view_from_jwt_opt, person::*};
 use lemmy_db_queries::{from_opt_str_to_opt_enum, source::person::Person_, SortType};
 use lemmy_db_schema::source::person::*;
 use lemmy_db_views::{comment_view::CommentQueryBuilder, post_view::PostQueryBuilder};
@@ -30,8 +24,13 @@ impl PerformCrud for GetPersonDetails {
     let data: &GetPersonDetails = &self;
     let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
 
-    let show_nsfw = user_show_nsfw(&local_user_view);
-    let show_bot_accounts = user_show_bot_accounts(&local_user_view);
+    let show_nsfw = local_user_view.as_ref().map(|t| t.local_user.show_nsfw);
+    let show_bot_accounts = local_user_view
+      .as_ref()
+      .map(|t| t.local_user.show_bot_accounts);
+    let show_read_posts = local_user_view
+      .as_ref()
+      .map(|t| t.local_user.show_read_posts);
 
     let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
 
@@ -71,6 +70,7 @@ impl PerformCrud for GetPersonDetails {
         .sort(sort)
         .show_nsfw(show_nsfw)
         .show_bot_accounts(show_bot_accounts)
+        .show_read_posts(show_read_posts)
         .saved_only(saved_only)
         .community_id(community_id)
         .my_person_id(person_id)