Merge branch 'main' into feature/mark_post_as_read

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

diff --git a/crates/api_crud/src/comment/read.rs b/crates/api_crud/src/comment/read.rs
index 4d144382089688aa2b1a2eeb137941b4dad884b1..12ccbd5a1a6b6b6b7427d66ac3c44d7072673da9 100644 (file)
--- a/crates/api_crud/src/comment/read.rs
+++ b/crates/api_crud/src/comment/read.rs
@@ -1,16 +1,10 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
-use lemmy_api_common::{
-  blocking,
-  comment::*,
-  get_local_user_view_from_jwt_opt,
-  user_show_bot_accounts,
-};
-use lemmy_db_queries::{ListingType, SortType};
+use lemmy_api_common::{blocking, comment::*, get_local_user_view_from_jwt_opt};
+use lemmy_db_queries::{from_opt_str_to_opt_enum, ListingType, SortType};
 use lemmy_db_views::comment_view::CommentQueryBuilder;
 use lemmy_utils::{ApiError, ConnectionId, LemmyError};
 use lemmy_websocket::LemmyContext;
-use std::str::FromStr;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for GetComments {
@@ -24,11 +18,13 @@ impl PerformCrud for GetComments {
     let data: &GetComments = &self;
     let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
 
-    let show_bot_accounts = user_show_bot_accounts(&local_user_view);
+    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 type_ = ListingType::from_str(&data.type_)?;
-    let sort = SortType::from_str(&data.sort)?;
+    let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
+    let listing_type: Option<ListingType> = from_opt_str_to_opt_enum(&data.type_);
 
     let community_id = data.community_id;
     let community_name = data.community_name.to_owned();
@@ -37,8 +33,8 @@ impl PerformCrud for GetComments {
     let limit = data.limit;
     let comments = blocking(context.pool(), move |conn| {
       CommentQueryBuilder::create(conn)
-        .listing_type(type_)
-        .sort(&sort)
+        .listing_type(listing_type)
+        .sort(sort)
         .saved_only(saved_only)
         .community_id(community_id)
         .community_name(community_name)