Rework error handling (fixes #1714) (#2135)

[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 8c3e10e581e8d9b469ee4715dfb9bd2bc2001ace..515c7103b2e297871a272618102258cce595f5ea 100644 (file)
--- a/crates/api/src/comment_report.rs
+++ b/crates/api/src/comment_report.rs
@@ -61,8 +61,7 @@ impl Perform for CreateCommentReport {
       CommentReport::report(conn, &report_form)
     })
     .await?
-    .map_err(LemmyError::from)
-    .map_err(|e| e.with_message("couldnt_create_report"))?;
+    .map_err(|e| LemmyError::from_error_message(e, "couldnt_create_report"))?;
 
     let comment_report_view = blocking(context.pool(), move |conn| {
       CommentReportView::read(conn, report.id, person_id)
@@ -129,8 +128,7 @@ impl Perform for ResolveCommentReport {
 
     blocking(context.pool(), resolve_fun)
       .await?
-      .map_err(LemmyError::from)
-      .map_err(|e| e.with_message("couldnt_resolve_report"))?;
+      .map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
 
     let report_id = data.report_id;
     let comment_report_view = blocking(context.pool(), move |conn| {