Pass LocalUser to PostQuery etc, instead of separate params (#2413)

[lemmy.git] / crates / api_crud / src / comment / list.rs

diff --git a/crates/api_crud/src/comment/list.rs b/crates/api_crud/src/comment/list.rs
index ca40d99c09205b0c8bb8efae40c7edc813ed02da..e7632cba2dd1fe441b5836862de9f923c929ca00 100644 (file)
--- a/crates/api_crud/src/comment/list.rs
+++ b/crates/api_crud/src/comment/list.rs
@@ -32,14 +32,8 @@ impl PerformCrud for GetComments {
     let local_user_view =
       get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
         .await?;
-
     check_private_instance(&local_user_view, context.pool()).await?;
 
-    let show_bot_accounts = local_user_view
-      .as_ref()
-      .map(|t| t.local_user.show_bot_accounts);
-    let person_id = local_user_view.map(|u| u.person.id);
-
     let community_id = data.community_id;
     let listing_type = listing_type_with_site_default(data.type_, context.pool()).await?;
 
@@ -70,6 +64,7 @@ impl PerformCrud for GetComments {
     };
 
     let post_id = data.post_id;
+    let local_user = local_user_view.map(|l| l.local_user);
     let mut comments = blocking(context.pool(), move |conn| {
       CommentQuery::builder()
         .conn(conn)
@@ -81,8 +76,7 @@ impl PerformCrud for GetComments {
         .community_actor_id(community_actor_id)
         .parent_path(parent_path)
         .post_id(post_id)
-        .my_person_id(person_id)
-        .show_bot_accounts(show_bot_accounts)
+        .local_user(local_user.as_ref())
         .page(page)
         .limit(limit)
         .build()