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

[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 cda2f65b667a1019739eacba26fcc2befd41a88a..af19402ee3e0c82bbb18daeab573237d214f401d 100644 (file)
--- a/crates/api_crud/src/post/read.rs
+++ b/crates/api_crud/src/post/read.rs
@@ -9,7 +9,6 @@ use lemmy_api_common::{
     local_user_view_from_jwt_opt,
     mark_post_as_read,
   },
-  websocket::handlers::online_users::GetPostUsersOnline,
 };
 use lemmy_db_schema::{
   aggregates::structs::{PersonPostAggregates, PersonPostAggregatesForm},
@@ -18,21 +17,17 @@ use lemmy_db_schema::{
 };
 use lemmy_db_views::{post_view::PostQuery, structs::PostView};
 use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for GetPost {
   type Response = GetPostResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<GetPostResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetPostResponse, LemmyError> {
     let data: &GetPost = self;
     let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
-    let local_site = LocalSite::read(context.pool()).await?;
+    let local_site = LocalSite::read(&mut context.pool()).await?;
 
     check_private_instance(&local_user_view, &local_site)?;
 
@@ -42,40 +37,48 @@ impl PerformCrud for GetPost {
     let post_id = if let Some(id) = data.id {
       id
     } else if let Some(comment_id) = data.comment_id {
-      Comment::read(context.pool(), comment_id)
+      Comment::read(&mut context.pool(), comment_id)
         .await
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?
+        .with_lemmy_type(LemmyErrorType::CouldntFindPost)?
         .post_id
     } else {
-      Err(LemmyError::from_message("couldnt_find_post"))?
+      Err(LemmyErrorType::CouldntFindPost)?
     };
 
     // Check to see if the person is a mod or admin, to show deleted / removed
-    let community_id = Post::read(context.pool(), post_id).await?.community_id;
-    let is_mod_or_admin =
-      is_mod_or_admin_opt(context.pool(), local_user_view.as_ref(), Some(community_id))
-        .await
-        .is_ok();
+    let community_id = Post::read(&mut context.pool(), post_id).await?.community_id;
+    let is_mod_or_admin = is_mod_or_admin_opt(
+      &mut context.pool(),
+      local_user_view.as_ref(),
+      Some(community_id),
+    )
+    .await
+    .is_ok();
 
-    let post_view = PostView::read(context.pool(), post_id, person_id, Some(is_mod_or_admin))
-      .await
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
+    let post_view = PostView::read(
+      &mut context.pool(),
+      post_id,
+      person_id,
+      Some(is_mod_or_admin),
+    )
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntFindPost)?;
 
     // 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, post_id, context.pool()).await?;
+      mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
     }
 
     // Necessary for the sidebar subscribed
     let community_view = CommunityView::read(
-      context.pool(),
+      &mut context.pool(),
       community_id,
       person_id,
       Some(is_mod_or_admin),
     )
     .await
-    .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_community"))?;
+    .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
 
     // Insert into PersonPostAggregates
     // to update the read_comments count
@@ -87,36 +90,35 @@ impl PerformCrud for GetPost {
         read_comments,
         ..PersonPostAggregatesForm::default()
       };
-      PersonPostAggregates::upsert(context.pool(), &person_post_agg_form)
+      PersonPostAggregates::upsert(&mut context.pool(), &person_post_agg_form)
         .await
-        .map_err(|e| LemmyError::from_error_message(e, "couldnt_find_post"))?;
+        .with_lemmy_type(LemmyErrorType::CouldntFindPost)?;
     }
 
-    let moderators = CommunityModeratorView::for_community(context.pool(), community_id).await?;
+    let moderators =
+      CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
 
     // Fetch the cross_posts
     let cross_posts = if let Some(url) = &post_view.post.url {
-      PostQuery::builder()
-        .pool(context.pool())
+      let mut x_posts = PostQuery::builder()
+        .pool(&mut context.pool())
         .url_search(Some(url.inner().as_str().into()))
         .build()
         .list()
-        .await?
+        .await?;
+
+      // Don't return this post as one of the cross_posts
+      x_posts.retain(|x| x.post.id != post_id);
+      x_posts
     } else {
       Vec::new()
     };
 
-    let online = context
-      .chat_server()
-      .send(GetPostUsersOnline { post_id })
-      .await?;
-
     // Return the jwt
     Ok(GetPostResponse {
       post_view,
       community_view,
       moderators,
-      online,
       cross_posts,
     })
   }