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

diff --git a/crates/api/src/private_message_report/create.rs b/crates/api/src/private_message_report/create.rs
index a9ca0291..4ca1d7cd 100644
--- a/crates/api/src/private_message_report/create.rs
+++ b/crates/api/src/private_message_report/create.rs
@@ -3,11 +3,9 @@ use actix_web::web::Data;
 use lemmy_api_common::{
   context::LemmyContext,
   private_message::{CreatePrivateMessageReport, PrivateMessageReportResponse},
-  utils::{local_user_view_from_jwt, send_new_report_email_to_admins},
-  websocket::UserOperation,
+  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,
@@ -16,66 +14,53 @@ use lemmy_db_schema::{
   traits::{Crud, Reportable},
 };
 use lemmy_db_views::structs::PrivateMessageReportView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+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> {
+  #[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(context.pool()).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 private_message_id = self.private_message_id;
-    let private_message = PrivateMessage::read(context.pool(), 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 = PrivateMessageReport::report(context.pool(), &report_form)
+    let report = PrivateMessageReport::report(&mut context.pool(), &report_form)
       .await
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
+      .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
     let private_message_report_view =
-      PrivateMessageReportView::read(context.pool(), report.id).await?;
+      PrivateMessageReportView::read(&mut context.pool(), report.id).await?;
 
     // 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,
-        context.pool(),
+        &mut context.pool(),
         context.settings(),
       )
       .await?;
     }
 
-    let res = PrivateMessageReportResponse {
-      private_message_report_view,
-    };
-
-    context.send_mod_ws_message(
-      &UserOperation::CreatePrivateMessageReport,
-      &res,
-      CommunityId(0),
-      websocket_id,
-    )?;
-
     // TODO: consider federating this
 
-    Ok(res)
+    Ok(PrivateMessageReportResponse {
+      private_message_report_view,
+    })
   }
 }