From dc9abcede17a0596ae477e6dc5e5deb282822835 Mon Sep 17 00:00:00 2001 From: dullbananas Date: Mon, 20 Jan 2025 02:39:15 -0700 Subject: [PATCH 1/2] Clean up LemmyError::status_code (#5330) --- crates/utils/src/error.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/utils/src/error.rs b/crates/utils/src/error.rs index d9b02cf5a..49e0fa52e 100644 --- a/crates/utils/src/error.rs +++ b/crates/utils/src/error.rs @@ -242,14 +242,9 @@ cfg_if! { impl actix_web::error::ResponseError for LemmyError { fn status_code(&self) -> actix_web::http::StatusCode { - if self.error_type == LemmyErrorType::IncorrectLogin { - return actix_web::http::StatusCode::UNAUTHORIZED; - } - if self.error_type == LemmyErrorType::NotFound { - return actix_web::http::StatusCode::NOT_FOUND; - } - match self.inner.downcast_ref::() { - Some(diesel::result::Error::NotFound) => actix_web::http::StatusCode::NOT_FOUND, + match self.error_type { + LemmyErrorType::IncorrectLogin => actix_web::http::StatusCode::UNAUTHORIZED, + LemmyErrorType::NotFound => actix_web::http::StatusCode::NOT_FOUND, _ => actix_web::http::StatusCode::BAD_REQUEST, } } From 1d94c26e5a6e91208f586689bd5ffac730dbfd8b Mon Sep 17 00:00:00 2001 From: Nutomic Date: Mon, 20 Jan 2025 14:54:25 +0000 Subject: [PATCH 2/2] Return correct status code for rate limit error (ref #5332) (#5333) --- crates/utils/src/error.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/utils/src/error.rs b/crates/utils/src/error.rs index 49e0fa52e..806a4f86f 100644 --- a/crates/utils/src/error.rs +++ b/crates/utils/src/error.rs @@ -245,6 +245,7 @@ cfg_if! { match self.error_type { LemmyErrorType::IncorrectLogin => actix_web::http::StatusCode::UNAUTHORIZED, LemmyErrorType::NotFound => actix_web::http::StatusCode::NOT_FOUND, + LemmyErrorType::RateLimitError => actix_web::http::StatusCode::TOO_MANY_REQUESTS, _ => actix_web::http::StatusCode::BAD_REQUEST, } }