X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi%2Fsrc%2Fpost_report%2Fcreate.rs;h=d4100a84e77662468952d08a1096e847d13b466a;hb=c8063f3267cf2b3622f1fdc69128c6b55feefbbc;hp=092f1cd8d8d10c05001d625b86a931727a97c11f;hpb=a5707328cff0133373491ef8e8908faeefacfa30;p=lemmy.git

diff --git a/crates/api/src/post_report/create.rs b/crates/api/src/post_report/create.rs
index 092f1cd8..d4100a84 100644
--- a/crates/api/src/post_report/create.rs
+++ b/crates/api/src/post_report/create.rs
@@ -1,10 +1,16 @@
-use crate::{check_report_reason, Perform};
-use actix_web::web::Data;
+use crate::check_report_reason;
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
 use lemmy_api_common::{
   context::LemmyContext,
   post::{CreatePostReport, PostReportResponse},
-  utils::{check_community_ban, local_user_view_from_jwt, send_new_report_email_to_admins},
-  websocket::UserOperation,
+  send_activity::{ActivityChannel, SendActivityData},
+  utils::{
+    check_community_ban,
+    local_user_view_from_jwt,
+    sanitize_html,
+    send_new_report_email_to_admins,
+  },
 };
 use lemmy_db_schema::{
   source::{
@@ -14,67 +20,62 @@ 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> {
-    let data: &CreatePostReport = self;
-    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
-    let local_site = LocalSite::read(context.pool()).await?;
-
-    let reason = self.reason.trim();
-    check_report_reason(reason, &local_site)?;
+#[tracing::instrument(skip(context))]
+pub async fn create_post_report(
+  data: Json<CreatePostReport>,
+  context: Data<LemmyContext>,
+) -> Result<Json<PostReportResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
+  let local_site = LocalSite::read(&mut context.pool()).await?;
 
-    let person_id = local_user_view.person.id;
-    let post_id = data.post_id;
-    let post_view = PostView::read(context.pool(), post_id, None, None).await?;
+  let reason = sanitize_html(data.reason.trim());
+  check_report_reason(&reason, &local_site)?;
 
-    check_community_ban(person_id, post_view.community.id, context.pool()).await?;
+  let person_id = local_user_view.person.id;
+  let post_id = data.post_id;
+  let post_view = PostView::read(&mut context.pool(), post_id, None, false).await?;
 
-    let report_form = PostReportForm {
-      creator_id: person_id,
-      post_id,
-      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(),
-    };
+  check_community_ban(person_id, post_view.community.id, &mut context.pool()).await?;
 
-    let report = PostReport::report(context.pool(), &report_form)
-      .await
-      .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
+  let report_form = PostReportForm {
+    creator_id: person_id,
+    post_id,
+    original_post_name: post_view.post.name,
+    original_post_url: post_view.post.url,
+    original_post_body: post_view.post.body,
+    reason,
+  };
 
-    let post_report_view = PostReportView::read(context.pool(), report.id, person_id).await?;
+  let report = PostReport::report(&mut context.pool(), &report_form)
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-    // 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,
-        context.pool(),
-        context.settings(),
-      )
-      .await?;
-    }
+  let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id).await?;
 
-    let res = PostReportResponse { post_report_view };
+  // 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?;
+  }
 
-    context.send_mod_ws_message(
-      &UserOperation::CreatePostReport,
-      &res,
-      post_view.community.id,
-      websocket_id,
-    )?;
+  ActivityChannel::submit_activity(
+    SendActivityData::CreateReport(
+      post_view.post.ap_id.inner().clone(),
+      local_user_view.person,
+      post_view.community,
+      data.reason.clone(),
+    ),
+    &context,
+  )
+  .await?;
 
-    Ok(res)
-  }
+  Ok(Json(PostReportResponse { post_report_view }))
 }