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

[lemmy.git] / crates / api / src / comment_report / resolve.rs

diff --git a/crates/api/src/comment_report/resolve.rs b/crates/api/src/comment_report/resolve.rs
index 9446fb3659a23825398c9c24502132dbbb9defe7..111495276ac5f2778ff5b3bfd6fd2a4d2c181c9f 100644 (file)
--- a/crates/api/src/comment_report/resolve.rs
+++ b/crates/api/src/comment_report/resolve.rs
@@ -1,71 +1,50 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
   comment::{CommentReportResponse, ResolveCommentReport},
-  get_local_user_view_from_jwt,
-  is_mod_or_admin,
+  context::LemmyContext,
+  utils::{is_mod_or_admin, local_user_view_from_jwt},
 };
 use lemmy_db_schema::{source::comment_report::CommentReport, traits::Reportable};
-use lemmy_db_views::comment_report_view::CommentReportView;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::{messages::SendModRoomMessage, LemmyContext, UserOperation};
+use lemmy_db_views::structs::CommentReportView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 /// Resolves or unresolves a comment report and notifies the moderators of the community
 #[async_trait::async_trait(?Send)]
 impl Perform for ResolveCommentReport {
   type Response = CommentReportResponse;
 
-  #[tracing::instrument(skip(context, websocket_id))]
+  #[tracing::instrument(skip(context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
   ) -> Result<CommentReportResponse, LemmyError> {
     let data: &ResolveCommentReport = 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 report_id = data.report_id;
     let person_id = local_user_view.person.id;
-    let report = blocking(context.pool(), move |conn| {
-      CommentReportView::read(conn, report_id, person_id)
-    })
-    .await??;
+    let report = CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
 
     let person_id = local_user_view.person.id;
-    is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
-
-    let resolved = data.resolved;
-    let resolve_fun = move |conn: &'_ _| {
-      if resolved {
-        CommentReport::resolve(conn, report_id, person_id)
-      } else {
-        CommentReport::unresolve(conn, report_id, person_id)
-      }
-    };
-
-    blocking(context.pool(), resolve_fun)
-      .await?
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
+    is_mod_or_admin(&mut context.pool(), person_id, report.community.id).await?;
+
+    if data.resolved {
+      CommentReport::resolve(&mut context.pool(), report_id, person_id)
+        .await
+        .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
+    } else {
+      CommentReport::unresolve(&mut context.pool(), report_id, person_id)
+        .await
+        .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
+    }
 
     let report_id = data.report_id;
-    let comment_report_view = blocking(context.pool(), move |conn| {
-      CommentReportView::read(conn, report_id, person_id)
-    })
-    .await??;
+    let comment_report_view =
+      CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
 
-    let res = CommentReportResponse {
+    Ok(CommentReportResponse {
       comment_report_view,
-    };
-
-    context.chat_server().do_send(SendModRoomMessage {
-      op: UserOperation::ResolveCommentReport,
-      response: res.clone(),
-      community_id: report.community.id,
-      websocket_id,
-    });
-
-    Ok(res)
+    })
   }
 }