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

[lemmy.git] / crates / api_crud / src / user / delete.rs

diff --git a/crates/api_crud/src/user/delete.rs b/crates/api_crud/src/user/delete.rs
index 24f3c4003f07d6ad106f3e8cbf594010bf061c52..050f54116c7e3ade4383721c3c174c60b292c9ed 100644 (file)
--- a/crates/api_crud/src/user/delete.rs
+++ b/crates/api_crud/src/user/delete.rs
@@ -27,21 +27,21 @@ impl PerformCrud for DeleteAccount {
     )
     .unwrap_or(false);
     if !valid {
-      return Err(ApiError::err("password_incorrect").into());
+      return Err(ApiError::err_plain("password_incorrect").into());
     }
 
     // Comments
     let person_id = local_user_view.person.id;
     let permadelete = move |conn: &'_ _| Comment::permadelete_for_creator(conn, person_id);
-    if blocking(context.pool(), permadelete).await?.is_err() {
-      return Err(ApiError::err("couldnt_update_comment").into());
-    }
+    blocking(context.pool(), permadelete)
+      .await?
+      .map_err(|e| ApiError::err("couldnt_update_comment", e))?;
 
     // Posts
     let permadelete = move |conn: &'_ _| Post::permadelete_for_creator(conn, person_id);
-    if blocking(context.pool(), permadelete).await?.is_err() {
-      return Err(ApiError::err("couldnt_update_post").into());
-    }
+    blocking(context.pool(), permadelete)
+      .await?
+      .map_err(|e| ApiError::err("couldnt_update_post", e))?;
 
     blocking(context.pool(), move |conn| {
       Person::delete_account(conn, person_id)