X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fpost_report%2Fcreate.rs;h=a4081015ca6152dc3b79298c3e35838036756113;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=7396d3f8c3512b1f8c5e04c997e41618013879d4;hpb=2732a5bf0707cfca38cf6e826d867d69eb6f4888;p=lemmy.git

diff --git a/crates/api/src/post_report/create.rs b/crates/api/src/post_report/create.rs
index 7396d3f8..a4081015 100644
--- a/crates/api/src/post_report/create.rs
+++ b/crates/api/src/post_report/create.rs
@@ -3,8 +3,12 @@ use actix_web::web::Data;
 use lemmy_api_common::{
   context::LemmyContext,
   post::{CreatePostReport, PostReportResponse},
-  utils::{check_community_ban, get_local_user_view_from_jwt},
-  websocket::UserOperation,
+  utils::{
+    check_community_ban,
+    local_user_view_from_jwt,
+    sanitize_html,
+    send_new_report_email_to_admins,
+  },
 };
 use lemmy_db_schema::{
   source::{
@@ -14,32 +18,27 @@ use lemmy_db_schema::{
   traits::Reportable,
 };
 use lemmy_db_views::structs::{PostReportView, PostView};
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 /// Creates a post report and notifies the moderators of the community
 #[async_trait::async_trait(?Send)]
 impl Perform for CreatePostReport {
   type Response = PostReportResponse;
 
-  #[tracing::instrument(skip(context, websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<PostReportResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<PostReportResponse, LemmyError> {
     let data: &CreatePostReport = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
-    let local_site = LocalSite::read(context.pool()).await?;
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
+    let local_site = LocalSite::read(&mut context.pool()).await?;
 
-    let reason = self.reason.trim();
-    check_report_reason(reason, &local_site)?;
+    let reason = sanitize_html(self.reason.trim());
+    check_report_reason(&reason, &local_site)?;
 
     let person_id = local_user_view.person.id;
     let post_id = data.post_id;
-    let post_view = PostView::read(context.pool(), post_id, None).await?;
+    let post_view = PostView::read(&mut context.pool(), post_id, None, None).await?;
 
-    check_community_ban(person_id, post_view.community.id, context.pool()).await?;
+    check_community_ban(person_id, post_view.community.id, &mut context.pool()).await?;
 
     let report_form = PostReportForm {
       creator_id: person_id,
@@ -47,27 +46,26 @@ impl Perform for CreatePostReport {
       original_post_name: post_view.post.name,
       original_post_url: post_view.post.url,
       original_post_body: post_view.post.body,
-      reason: reason.to_owned(),
+      reason,
     };
 
-    let report = PostReport::report(context.pool(), &report_form)
+    let report = PostReport::report(&mut context.pool(), &report_form)
       .await
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
-
-    let post_report_view = PostReportView::read(context.pool(), report.id, person_id).await?;
+      .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-    let res = PostReportResponse { post_report_view };
+    let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id).await?;
 
-    context
-      .chat_server()
-      .send_mod_room_message(
-        UserOperation::CreatePostReport,
-        &res,
-        post_view.community.id,
-        websocket_id,
+    // Email the admins
+    if local_site.reports_email_admins {
+      send_new_report_email_to_admins(
+        &post_report_view.creator.name,
+        &post_report_view.post_creator.name,
+        &mut context.pool(),
+        context.settings(),
       )
       .await?;
+    }
 
-    Ok(res)
+    Ok(PostReportResponse { post_report_view })
   }
 }