Replace Option<bool> with bool for PostQuery and CommentQuery (#3819) (#3857)

[lemmy.git] / crates / apub / src / api / read_person.rs

diff --git a/crates/apub/src/api/read_person.rs b/crates/apub/src/api/read_person.rs
index 60cea766348af1acf47d905a2f19fd033b66ce58..23d6457af24b6fe979004138cd85a58d6603a0a3 100644 (file)
--- a/crates/apub/src/api/read_person.rs
+++ b/crates/apub/src/api/read_person.rs
@@ -4,7 +4,7 @@ use actix_web::web::{Json, Query};
 use lemmy_api_common::{
   context::LemmyContext,
   person::{GetPersonDetails, GetPersonDetailsResponse},
-  utils::{check_private_instance, is_admin, local_user_view_from_jwt_opt},
+  utils::{check_private_instance, local_user_view_from_jwt_opt},
 };
 use lemmy_db_schema::{
   source::{local_site::LocalSite, person::Person},
@@ -26,7 +26,6 @@ pub async fn read_person(
 
   let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), &context).await;
   let local_site = LocalSite::read(&mut context.pool()).await?;
-  let is_admin = local_user_view.as_ref().map(|luv| is_admin(luv).is_ok());
 
   check_private_instance(&local_user_view, &local_site)?;
 
@@ -51,50 +50,39 @@ pub async fn read_person(
   let sort = data.sort;
   let page = data.page;
   let limit = data.limit;
-  let saved_only = data.saved_only;
+  let saved_only = data.saved_only.unwrap_or_default();
   let community_id = data.community_id;
-  let local_user = local_user_view.map(|l| l.local_user);
-  let local_user_clone = local_user.clone();
+  // If its saved only, you don't care what creator it was
+  // Or, if its not saved, then you only want it for that specific creator
+  let creator_id = if !saved_only {
+    Some(person_details_id)
+  } else {
+    None
+  };
 
   let posts = PostQuery {
     sort,
     saved_only,
-    local_user:local_user.as_ref(),
+    local_user: local_user_view.as_ref(),
     community_id,
-    is_mod_or_admin: is_admin,
+    is_profile_view: true,
     page,
     limit,
-    creator_id:
-      // If its saved only, you don't care what creator it was
-      // Or, if its not saved, then you only want it for that specific creator
-      if !saved_only.unwrap_or(false) {
-        Some(person_details_id)
-      } else {
-        None
-      }
-    ,
+    creator_id,
     ..Default::default()
   }
   .list(&mut context.pool())
   .await?;
 
   let comments = CommentQuery {
-    local_user: (local_user_clone.as_ref()),
-    sort: (sort.map(post_to_comment_sort_type)),
-    saved_only: (saved_only),
-    show_deleted_and_removed: (Some(false)),
-    community_id: (community_id),
-    page: (page),
-    limit: (limit),
-    creator_id: (
-      // If its saved only, you don't care what creator it was
-      // Or, if its not saved, then you only want it for that specific creator
-      if !saved_only.unwrap_or(false) {
-        Some(person_details_id)
-      } else {
-        None
-      }
-    ),
+    local_user: local_user_view.as_ref(),
+    sort: sort.map(post_to_comment_sort_type),
+    saved_only,
+    community_id,
+    is_profile_view: true,
+    page,
+    limit,
+    creator_id,
     ..Default::default()
   }
   .list(&mut context.pool())