Implement reports for private messages (#2433)

[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 4f4ef3bb80499b25f92425798110a24dc18abaf9..6d21f066b4e29012cfe93659f8d8e828ea00c727 100644 (file)
--- a/crates/api/src/comment_report/create.rs
+++ b/crates/api/src/comment_report/create.rs
@@ -1,19 +1,17 @@
-use crate::Perform;
+use crate::{check_report_reason, Perform};
+use activitypub_federation::core::object_id::ObjectId;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  check_community_ban,
   comment::{CommentReportResponse, CreateCommentReport},
-  get_local_user_view_from_jwt,
+  utils::{blocking, check_community_ban, get_local_user_view_from_jwt},
 };
 use lemmy_apub::protocol::activities::community::report::Report;
-use lemmy_apub_lib::object_id::ObjectId;
 use lemmy_db_schema::{
   source::comment_report::{CommentReport, CommentReportForm},
   traits::Reportable,
 };
-use lemmy_db_views::{comment_report_view::CommentReportView, comment_view::CommentView};
-use lemmy_utils::{ConnectionId, LemmyError};
+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
@@ -31,14 +29,8 @@ impl Perform for CreateCommentReport {
     let local_user_view =
       get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
 
-    // check size of report and check for whitespace
-    let reason = data.reason.trim();
-    if reason.is_empty() {
-      return Err(LemmyError::from_message("report_reason_required"));
-    }
-    if reason.chars().count() > 1000 {
-      return Err(LemmyError::from_message("report_too_long"));
-    }
+    let reason = self.reason.trim();
+    check_report_reason(reason, context)?;
 
     let person_id = local_user_view.person.id;
     let comment_id = data.comment_id;
@@ -53,7 +45,7 @@ impl Perform for CreateCommentReport {
       creator_id: person_id,
       comment_id,
       original_comment_text: comment_view.comment.content,
-      reason: data.reason.to_owned(),
+      reason: reason.to_owned(),
     };
 
     let report = blocking(context.pool(), move |conn| {