]> Untitled Git - lemmy.git/commitdiff
Send error message when rate limit is reached (#2527)
authorNutomic <me@nutomic.com>
Thu, 3 Nov 2022 18:13:40 +0000 (18:13 +0000)
committerGitHub <noreply@github.com>
Thu, 3 Nov 2022 18:13:40 +0000 (18:13 +0000)
* Send error message when rate limit is reached

* l18n key

crates/utils/src/rate_limit/mod.rs

index 48911b5cf03feec7c7ac37f4e7170b5e9bed0d58..ed019255f8026262f6977080c5667c4ee867cfb1 100644 (file)
@@ -1,8 +1,5 @@
-use crate::{utils::get_ip, IpAddr};
-use actix_web::{
-  dev::{Service, ServiceRequest, ServiceResponse, Transform},
-  HttpResponse,
-};
+use crate::{error::LemmyError, utils::get_ip, IpAddr};
+use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
 use futures::future::{ok, Ready};
 use rate_limiter::{RateLimitType, RateLimiter};
 use serde::{Deserialize, Serialize};
@@ -177,10 +174,9 @@ where
         service.call(req).await
       } else {
         let (http_req, _) = req.into_parts();
-        // if rate limit was hit, respond with http 400
-        Ok(ServiceResponse::new(
+        Ok(ServiceResponse::from_err(
+          LemmyError::from_message("rate_limit_error"),
           http_req,
-          HttpResponse::BadRequest().finish(),
         ))
       }
     })