Dont swallow API errors (fixes #1834) (#1837)

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

diff --git a/crates/api/src/comment_report.rs b/crates/api/src/comment_report.rs
index 67bc42acc00fc16e3d830e51b3f94f111070207c..d12b8d6f2762ec5387ce9096998f9e5052794f0e 100644 (file)
--- a/crates/api/src/comment_report.rs
+++ b/crates/api/src/comment_report.rs
@@ -33,10 +33,10 @@ impl Perform for CreateCommentReport {
     // check size of report and check for whitespace
     let reason = data.reason.trim();
     if reason.is_empty() {
-      return Err(ApiError::err("report_reason_required").into());
+      return Err(ApiError::err_plain("report_reason_required").into());
     }
     if reason.chars().count() > 1000 {
-      return Err(ApiError::err("report_too_long").into());
+      return Err(ApiError::err_plain("report_too_long").into());
     }
 
     let person_id = local_user_view.person.id;
@@ -59,7 +59,7 @@ impl Perform for CreateCommentReport {
       CommentReport::report(conn, &report_form)
     })
     .await?
-    .map_err(|_| ApiError::err("couldnt_create_report"))?;
+    .map_err(|e| ApiError::err("couldnt_create_report", e))?;
 
     let comment_report_view = blocking(context.pool(), move |conn| {
       CommentReportView::read(conn, report.id, person_id)
@@ -114,9 +114,9 @@ impl Perform for ResolveCommentReport {
       }
     };
 
-    if blocking(context.pool(), resolve_fun).await?.is_err() {
-      return Err(ApiError::err("couldnt_resolve_report").into());
-    };
+    blocking(context.pool(), resolve_fun)
+      .await?
+      .map_err(|e| ApiError::err("couldnt_resolve_report", e))?;
 
     let report_id = data.report_id;
     let comment_report_view = blocking(context.pool(), move |conn| {