Adding a site option to email admins for new reports. (#2730)

[lemmy.git] / crates / api / src / comment_report / create.rs

diff --git a/crates/api/src/comment_report/create.rs b/crates/api/src/comment_report/create.rs
index 2533aba1c56a106aa08fffcb8afa46509164bbab..9badc31a07694a2b45cdf678c17a40253e155970 100644 (file)
--- a/crates/api/src/comment_report/create.rs
+++ b/crates/api/src/comment_report/create.rs
@@ -1,11 +1,11 @@
 use crate::{check_report_reason, Perform};
-use activitypub_federation::core::object_id::ObjectId;
 use actix_web::web::Data;
 use lemmy_api_common::{
   comment::{CommentReportResponse, CreateCommentReport},
-  utils::{check_community_ban, get_local_user_view_from_jwt},
+  context::LemmyContext,
+  utils::{check_community_ban, get_local_user_view_from_jwt, send_new_report_email_to_admins},
+  websocket::UserOperation,
 };
-use lemmy_apub::protocol::activities::community::report::Report;
 use lemmy_db_schema::{
   source::{
     comment_report::{CommentReport, CommentReportForm},
@@ -15,7 +15,6 @@ use lemmy_db_schema::{
 };
 use lemmy_db_views::structs::{CommentReportView, CommentView};
 use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::{messages::SendModRoomMessage, LemmyContext, UserOperation};
 
 /// Creates a comment report and notifies the moderators of the community
 #[async_trait::async_trait(?Send)]
@@ -55,25 +54,30 @@ impl Perform for CreateCommentReport {
 
     let comment_report_view = CommentReportView::read(context.pool(), report.id, person_id).await?;
 
+    // Email the admins
+    if local_site.reports_email_admins {
+      send_new_report_email_to_admins(
+        &comment_report_view.creator.name,
+        &comment_report_view.comment_creator.name,
+        context.pool(),
+        context.settings(),
+      )
+      .await?;
+    }
+
     let res = CommentReportResponse {
       comment_report_view,
     };
 
-    context.chat_server().do_send(SendModRoomMessage {
-      op: UserOperation::CreateCommentReport,
-      response: res.clone(),
-      community_id: comment_view.community.id,
-      websocket_id,
-    });
-
-    Report::send(
-      ObjectId::new(comment_view.comment.ap_id),
-      &local_user_view.person.into(),
-      ObjectId::new(comment_view.community.actor_id),
-      reason.to_string(),
-      context,
-    )
-    .await?;
+    context
+      .chat_server()
+      .send_mod_room_message(
+        UserOperation::CreateCommentReport,
+        &res,
+        comment_view.community.id,
+        websocket_id,
+      )
+      .await?;
 
     Ok(res)
   }