First pass at adding comment trees. (#2362)

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

diff --git a/crates/api_crud/src/post/read.rs b/crates/api_crud/src/post/read.rs
index 801cfbd040376c9b1c92f3a80fd9197036060761..fbab8d67191cc810a9cbe1a93f3b6820974d953b 100644 (file)
--- a/crates/api_crud/src/post/read.rs
+++ b/crates/api_crud/src/post/read.rs
@@ -4,8 +4,11 @@ use lemmy_api_common::{
   post::{GetPost, GetPostResponse},
   utils::{blocking, check_private_instance, get_local_user_view_from_jwt_opt, mark_post_as_read},
 };
-use lemmy_db_schema::traits::DeleteableOrRemoveable;
-use lemmy_db_views::{comment_view::CommentQueryBuilder, structs::PostView};
+use lemmy_db_schema::{
+  source::comment::Comment,
+  traits::{Crud, DeleteableOrRemoveable},
+};
+use lemmy_db_views::structs::PostView;
 use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
 use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::{messages::GetPostUsersOnline, LemmyContext};
@@ -27,35 +30,33 @@ impl PerformCrud for GetPost {
 
     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 id = data.id;
+    // I'd prefer fetching the post_view by a comment join, but it adds a lot of boilerplate
+    let post_id = if let Some(id) = data.id {
+      id
+    } else if let Some(comment_id) = data.comment_id {
+      blocking(context.pool(), move |conn| Comment::read(conn, comment_id))
+        .await?
+        .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?
+        .post_id
+    } else {
+      Err(LemmyError::from_message("couldnt_find_post"))?
+    };
+
     let mut post_view = blocking(context.pool(), move |conn| {
-      PostView::read(conn, id, person_id)
+      PostView::read(conn, post_id, person_id)
     })
     .await?
     .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
 
     // Mark the post as read
+    let post_id = post_view.post.id;
     if let Some(person_id) = person_id {
-      mark_post_as_read(person_id, id, context.pool()).await?;
+      mark_post_as_read(person_id, post_id, context.pool()).await?;
     }
 
-    let id = data.id;
-    let mut comments = blocking(context.pool(), move |conn| {
-      CommentQueryBuilder::create(conn)
-        .my_person_id(person_id)
-        .show_bot_accounts(show_bot_accounts)
-        .post_id(id)
-        .limit(std::i64::MAX)
-        .list()
-    })
-    .await??;
-
-    // Necessary for the sidebar
+    // Necessary for the sidebar subscribed
     let community_id = post_view.community.id;
     let mut community_view = blocking(context.pool(), move |conn| {
       CommunityView::read(conn, community_id, person_id)
@@ -69,12 +70,6 @@ impl PerformCrud for GetPost {
         post_view.post = post_view.post.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();
-      }
       if community_view.community.deleted || community_view.community.removed {
         community_view.community = community_view.community.blank_out_deleted_or_removed_info();
       }
@@ -87,7 +82,7 @@ impl PerformCrud for GetPost {
 
     let online = context
       .chat_server()
-      .send(GetPostUsersOnline { post_id: data.id })
+      .send(GetPostUsersOnline { post_id })
       .await
       .unwrap_or(1);
 
@@ -95,7 +90,6 @@ impl PerformCrud for GetPost {
     Ok(GetPostResponse {
       post_view,
       community_view,
-      comments,
       moderators,
       online,
     })