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 4789b84fe096a9a83381490273e06f957bbe52d0..e6899fdc71becbd121f9b911c37a9b357906c151 100644 (file)
--- a/crates/api_crud/src/comment/read.rs
+++ b/crates/api_crud/src/comment/read.rs
@@ -1,106 +1,26 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
-use lemmy_api_common::{blocking, comment::*, get_local_user_view_from_jwt_opt};
-use lemmy_apub::{
-  fetcher::webfinger::webfinger_resolve,
-  objects::community::ApubCommunity,
-  EndpointType,
+use lemmy_api_common::{
+  build_response::build_comment_response,
+  comment::{CommentResponse, GetComment},
+  context::LemmyContext,
+  utils::{check_private_instance, local_user_view_from_jwt_opt},
 };
-use lemmy_db_schema::{
-  from_opt_str_to_opt_enum,
-  traits::DeleteableOrRemoveable,
-  ListingType,
-  SortType,
-};
-use lemmy_db_views::comment_view::{CommentQueryBuilder, CommentView};
-use lemmy_utils::{ApiError, ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_schema::source::local_site::LocalSite;
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for GetComment {
   type Response = CommentResponse;
 
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let data = self;
-    let local_user_view =
-      get_local_user_view_from_jwt_opt(&data.auth, context.pool(), context.secret()).await?;
-
-    let person_id = local_user_view.map(|u| u.person.id);
-    let id = data.id;
-    let comment_view = blocking(context.pool(), move |conn| {
-      CommentView::read(conn, id, person_id)
-    })
-    .await?
-    .map_err(|e| ApiError::err("couldnt_find_comment", e))?;
-
-    Ok(Self::Response {
-      comment_view,
-      form_id: None,
-      recipient_ids: Vec::new(),
-    })
-  }
-}
-
-#[async_trait::async_trait(?Send)]
-impl PerformCrud for GetComments {
-  type Response = GetCommentsResponse;
-
-  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(), context.secret()).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 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_actor_id = if let Some(name) = &data.community_name {
-      webfinger_resolve::<ApubCommunity>(name, EndpointType::Community, context, &mut 0)
-        .await
-        .ok()
-    } else {
-      None
-    };
-    let saved_only = data.saved_only;
-    let page = data.page;
-    let limit = data.limit;
-    let mut comments = blocking(context.pool(), move |conn| {
-      CommentQueryBuilder::create(conn)
-        .listing_type(listing_type)
-        .sort(sort)
-        .saved_only(saved_only)
-        .community_id(community_id)
-        .community_actor_id(community_actor_id)
-        .my_person_id(person_id)
-        .show_bot_accounts(show_bot_accounts)
-        .page(page)
-        .limit(limit)
-        .list()
-    })
-    .await?
-    .map_err(|e| ApiError::err("couldnt_get_comments", e))?;
+    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?;
 
-    // Blank out deleted or removed info
-    for cv in comments
-      .iter_mut()
-      .filter(|cv| cv.comment.deleted || cv.comment.removed)
-    {
-      cv.comment = cv.to_owned().comment.blank_out_deleted_or_removed_info();
-    }
+    check_private_instance(&local_user_view, &local_site)?;
 
-    Ok(GetCommentsResponse { comments })
+    build_comment_response(context, data.id, local_user_view, None, vec![]).await
   }
 }