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

[lemmy.git] / crates / apub / src / activities / community / report.rs

diff --git a/crates/apub/src/activities/community/report.rs b/crates/apub/src/activities/community/report.rs
index a5fab8a01a9d5c4081dbc593057b4a8a57a186b7..1dffacc39faa666d1847e5d987c73de509371fdc 100644 (file)
--- a/crates/apub/src/activities/community/report.rs
+++ b/crates/apub/src/activities/community/report.rs
@@ -16,8 +16,7 @@ use lemmy_api_common::{
   comment::{CommentReportResponse, CreateCommentReport},
   context::LemmyContext,
   post::{CreatePostReport, PostReportResponse},
-  utils::get_local_user_view_from_jwt,
-  websocket::UserOperation,
+  utils::local_user_view_from_jwt,
 };
 use lemmy_db_schema::{
   source::{
@@ -26,7 +25,6 @@ use lemmy_db_schema::{
   },
   traits::Reportable,
 };
-use lemmy_db_views::structs::{CommentReportView, PostReportView};
 use lemmy_utils::error::LemmyError;
 use url::Url;
 
@@ -39,8 +37,7 @@ impl SendActivity for CreatePostReport {
     response: &Self::Response,
     context: &Data<LemmyContext>,
   ) -> Result<(), LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
+    let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
     Report::send(
       ObjectId::from(response.post_report_view.post.ap_id.clone()),
       &local_user_view.person.into(),
@@ -61,8 +58,7 @@ impl SendActivity for CreateCommentReport {
     response: &Self::Response,
     context: &Data<LemmyContext>,
   ) -> Result<(), LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
+    let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
     Report::send(
       ObjectId::from(response.comment_report_view.comment.ap_id.clone()),
       &local_user_view.person.into(),
@@ -138,20 +134,7 @@ impl ActivityHandler for Report {
           reason: self.summary,
           original_post_body: post.body.clone(),
         };
-
-        let report = PostReport::report(context.pool(), &report_form).await?;
-
-        let post_report_view = PostReportView::read(context.pool(), report.id, actor.id).await?;
-
-        context
-          .chat_server()
-          .send_mod_room_message(
-            UserOperation::CreateCommentReport,
-            &PostReportResponse { post_report_view },
-            post.community_id,
-            None,
-          )
-          .await?;
+        PostReport::report(&mut context.pool(), &report_form).await?;
       }
       PostOrComment::Comment(comment) => {
         let report_form = CommentReportForm {
@@ -160,24 +143,7 @@ impl ActivityHandler for Report {
           original_comment_text: comment.content.clone(),
           reason: self.summary,
         };
-
-        let report = CommentReport::report(context.pool(), &report_form).await?;
-
-        let comment_report_view =
-          CommentReportView::read(context.pool(), report.id, actor.id).await?;
-        let community_id = comment_report_view.community.id;
-
-        context
-          .chat_server()
-          .send_mod_room_message(
-            UserOperation::CreateCommentReport,
-            &CommentReportResponse {
-              comment_report_view,
-            },
-            community_id,
-            None,
-          )
-          .await?;
+        CommentReport::report(&mut context.pool(), &report_form).await?;
       }
     };
     Ok(())