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

[lemmy.git] / crates / api / src / post / feature.rs

diff --git a/crates/api/src/post/feature.rs b/crates/api/src/post/feature.rs
index e1dd1e3d8bc5e7f76cabea8269c86091c9dac8e9..c59eba3134c99095ade7cda1852cd4e729c931c7 100644 (file)
--- a/crates/api/src/post/feature.rs
+++ b/crates/api/src/post/feature.rs
@@ -1,16 +1,16 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
+  build_response::build_post_response,
   context::LemmyContext,
   post::{FeaturePost, PostResponse},
   utils::{
     check_community_ban,
     check_community_deleted_or_removed,
-    get_local_user_view_from_jwt,
     is_admin,
     is_mod_or_admin,
+    local_user_view_from_jwt,
   },
-  websocket::UserOperation,
 };
 use lemmy_db_schema::{
   source::{
@@ -20,37 +20,32 @@ use lemmy_db_schema::{
   traits::Crud,
   PostFeatureType,
 };
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for FeaturePost {
   type Response = PostResponse;
 
-  #[tracing::instrument(skip(context, websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<PostResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostResponse, LemmyError> {
     let data: &FeaturePost = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
     let post_id = data.post_id;
-    let orig_post = Post::read(context.pool(), post_id).await?;
+    let orig_post = Post::read(&mut context.pool(), post_id).await?;
 
     check_community_ban(
       local_user_view.person.id,
       orig_post.community_id,
-      context.pool(),
+      &mut context.pool(),
     )
     .await?;
-    check_community_deleted_or_removed(orig_post.community_id, context.pool()).await?;
+    check_community_deleted_or_removed(orig_post.community_id, &mut context.pool()).await?;
 
     if data.feature_type == PostFeatureType::Community {
       // Verify that only the mods can feature in community
       is_mod_or_admin(
-        context.pool(),
+        &mut context.pool(),
         local_user_view.person.id,
         orig_post.community_id,
       )
@@ -70,7 +65,7 @@ impl Perform for FeaturePost {
         .featured_local(Some(data.featured))
         .build()
     };
-    Post::update(context.pool(), post_id, &new_post).await?;
+    Post::update(&mut context.pool(), post_id, &new_post).await?;
 
     // Mod tables
     let form = ModFeaturePostForm {
@@ -80,15 +75,14 @@ impl Perform for FeaturePost {
       is_featured_community: data.feature_type == PostFeatureType::Community,
     };
 
-    ModFeaturePost::create(context.pool(), &form).await?;
+    ModFeaturePost::create(&mut context.pool(), &form).await?;
 
-    context
-      .send_post_ws_message(
-        &UserOperation::FeaturePost,
-        data.post_id,
-        websocket_id,
-        Some(local_user_view.person.id),
-      )
-      .await
+    build_post_response(
+      context,
+      orig_post.community_id,
+      local_user_view.person.id,
+      post_id,
+    )
+    .await
   }
 }