X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fprivate_message_report%2Fcreate.rs;h=4ca1d7cd6265c58b24fd6ed787fbcb1660f56652;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=ee78af8046fceb4c917f6a53d3f8672d1c2fb417;hpb=004efd5d94da0eee2a51f8c88a441c0c4afe3871;p=lemmy.git

diff --git a/crates/api/src/private_message_report/create.rs b/crates/api/src/private_message_report/create.rs
index ee78af80..4ca1d7cd 100644
--- a/crates/api/src/private_message_report/create.rs
+++ b/crates/api/src/private_message_report/create.rs
@@ -1,75 +1,66 @@
 use crate::{check_report_reason, Perform};
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   private_message::{CreatePrivateMessageReport, PrivateMessageReportResponse},
-  utils::{blocking, get_local_user_view_from_jwt},
+  utils::{local_user_view_from_jwt, sanitize_html, send_new_report_email_to_admins},
 };
 use lemmy_db_schema::{
-  newtypes::CommunityId,
   source::{
+    local_site::LocalSite,
     private_message::PrivateMessage,
     private_message_report::{PrivateMessageReport, PrivateMessageReportForm},
   },
   traits::{Crud, Reportable},
 };
 use lemmy_db_views::structs::PrivateMessageReportView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::{messages::SendModRoomMessage, LemmyContext, UserOperation};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
 
 #[async_trait::async_trait(?Send)]
 impl Perform for CreatePrivateMessageReport {
   type Response = PrivateMessageReportResponse;
 
-  #[tracing::instrument(skip(context, websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&self.auth, context.pool(), context.secret()).await?;
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
+    let local_user_view = local_user_view_from_jwt(&self.auth, context).await?;
+    let local_site = LocalSite::read(&mut context.pool()).await?;
 
-    let reason = self.reason.trim();
-    check_report_reason(reason, context)?;
+    let reason = sanitize_html(self.reason.trim());
+    check_report_reason(&reason, &local_site)?;
 
     let person_id = local_user_view.person.id;
     let private_message_id = self.private_message_id;
-    let private_message = blocking(context.pool(), move |conn| {
-      PrivateMessage::read(conn, private_message_id)
-    })
-    .await??;
+    let private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
 
     let report_form = PrivateMessageReportForm {
       creator_id: person_id,
       private_message_id,
       original_pm_text: private_message.content,
-      reason: reason.to_owned(),
+      reason: reason.clone(),
     };
 
-    let report = blocking(context.pool(), move |conn| {
-      PrivateMessageReport::report(conn, &report_form)
-    })
-    .await?
-    .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
-
-    let private_message_report_view = blocking(context.pool(), move |conn| {
-      PrivateMessageReportView::read(conn, report.id)
-    })
-    .await??;
+    let report = PrivateMessageReport::report(&mut context.pool(), &report_form)
+      .await
+      .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-    let res = PrivateMessageReportResponse {
-      private_message_report_view,
-    };
+    let private_message_report_view =
+      PrivateMessageReportView::read(&mut context.pool(), report.id).await?;
 
-    context.chat_server().do_send(SendModRoomMessage {
-      op: UserOperation::CreatePrivateMessageReport,
-      response: res.clone(),
-      community_id: CommunityId(0),
-      websocket_id,
-    });
+    // Email the admins
+    if local_site.reports_email_admins {
+      send_new_report_email_to_admins(
+        &private_message_report_view.creator.name,
+        &private_message_report_view.private_message_creator.name,
+        &mut context.pool(),
+        context.settings(),
+      )
+      .await?;
+    }
 
     // TODO: consider federating this
 
-    Ok(res)
+    Ok(PrivateMessageReportResponse {
+      private_message_report_view,
+    })
   }
 }