include the rate limited action in the error message

Author: pietroalbini

src/rate_limiter.rs

@@ -27,6 +27,14 @@ impl LimitedAction {
         }
     }
 
+    pub fn error_message(&self) -> &'static str {
+        match self {
+            LimitedAction::PublishNew => {
+                "You have published too many new crates in a short period of time."
+            }
+        }
+    }
+
     /// Key used to identify this action in environment variables. See `src/config.rs`.
     pub fn env_var_key(&self) -> &'static str {
         match self {
@@ -62,6 +70,7 @@ impl RateLimiter {
             Ok(())
         } else {
             Err(Box::new(TooManyRequests {
+                action,
                 retry_after: bucket.last_refill
                     + chrono::Duration::from_std(self.config[&action].rate).unwrap(),
             }))

src/util/errors/json.rs

@@ -1,6 +1,7 @@
 use std::fmt;
 
 use super::{AppError, InternalAppErrorStatic};
+use crate::rate_limiter::LimitedAction;
 use crate::util::{json_response, AppResponse};
 
 use chrono::NaiveDateTime;
@@ -90,6 +91,7 @@ pub(super) struct BadRequest(pub(super) String);
 pub(super) struct ServerError(pub(super) String);
 #[derive(Debug)]
 pub(crate) struct TooManyRequests {
+    pub action: LimitedAction,
     pub retry_after: NaiveDateTime,
 }
 
@@ -137,9 +139,9 @@ impl AppError for TooManyRequests {
         let retry_after = self.retry_after.format(HTTP_DATE_FORMAT);
 
         let detail = format!(
-            "You have published too many crates in a \
-             short period of time. Please try again after {} or email \
+            "{} Please try again after {} or email \
              [email protected] to have your limit increased.",
+            self.action.error_message(),
             retry_after
         );
         let mut response = json_error(&detail, StatusCode::TOO_MANY_REQUESTS);