Make functions work with both connection and pool (#3420)

[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..e6899fdc71becbd121f9b911c37a9b357906c151 100644 (file)
--- a/crates/api_crud/src/comment/read.rs
+++ b/crates/api_crud/src/comment/read.rs
@@ -1,56 +1,26 @@
 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,
+  build_response::build_comment_response,
+  comment::{CommentResponse, GetComment},
+  context::LemmyContext,
+  utils::{check_private_instance, local_user_view_from_jwt_opt},
 };
-use lemmy_db_queries::{ListingType, SortType};
-use lemmy_db_views::comment_view::CommentQueryBuilder;
-use lemmy_utils::{ApiError, ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
-use std::str::FromStr;
+use lemmy_db_schema::source::local_site::LocalSite;
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
-impl PerformCrud for GetComments {
-  type Response = GetCommentsResponse;
+impl PerformCrud for GetComment {
+  type Response = CommentResponse;
 
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<GetCommentsResponse, LemmyError> {
-    let data: &GetComments = &self;
-    let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
+    let data = self;
+    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 show_bot_accounts = user_show_bot_accounts(&local_user_view);
-    let person_id = local_user_view.map(|u| u.person.id);
+    check_private_instance(&local_user_view, &local_site)?;
 
-    let type_ = ListingType::from_str(&data.type_)?;
-    let sort = SortType::from_str(&data.sort)?;
-
-    let community_id = data.community_id;
-    let community_name = data.community_name.to_owned();
-    let saved_only = data.saved_only;
-    let page = data.page;
-    let limit = data.limit;
-    let comments = blocking(context.pool(), move |conn| {
-      CommentQueryBuilder::create(conn)
-        .listing_type(type_)
-        .sort(&sort)
-        .saved_only(saved_only)
-        .community_id(community_id)
-        .community_name(community_name)
-        .my_person_id(person_id)
-        .show_bot_accounts(show_bot_accounts)
-        .page(page)
-        .limit(limit)
-        .list()
-    })
-    .await?
-    .map_err(|_| ApiError::err("couldnt_get_comments"))?;
-
-    Ok(GetCommentsResponse { comments })
+    build_comment_response(context, data.id, local_user_view, None, vec![]).await
   }
 }