include the rate limited action in the error message

Author: pietroalbini

src/rate_limiter.rs

@@ -33,6 +33,14 @@ impl LimitedAction {
             LimitedAction::PublishNew => "PUBLISH_NEW",
         }
     }
+
+    pub fn error_messagge(&self) -> &'static str {
+        match self {
+            LimitedAction::PublishNew => {
+                "You have published too many new crates in a short period of time"
+            }
+        }
+    }
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -62,6 +70,7 @@ impl RateLimiter {
             Ok(())
         } else {
             Err(Box::new(TooManyRequests {
+                action: performed_action,
                 retry_after: bucket.last_refill
                     + chrono::Duration::from_std(self.config_for_action(performed_action).rate)
                         .unwrap(),

src/util/errors/json.rs

@@ -4,6 +4,7 @@ use std::fmt;
 
 use super::{AppError, BoxedAppError, InternalAppErrorStatic};
 
+use crate::rate_limiter::LimitedAction;
 use chrono::NaiveDateTime;
 use http::{header, StatusCode};
 
@@ -74,6 +75,7 @@ pub(super) struct ServerError(pub(super) String);
 pub(crate) struct ServiceUnavailable(pub(super) String);
 #[derive(Debug)]
 pub(crate) struct TooManyRequests {
+    pub action: LimitedAction,
     pub retry_after: NaiveDateTime,
 }
 
@@ -131,9 +133,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 {retry_after} or email \
-             [email protected] to have your limit increased."
+            "{}. Please try again after {retry_after} or email \
+             [email protected] to have your limit increased.",
+            self.action.error_messagge()
         );
         let mut response = json_error(&detail, StatusCode::TOO_MANY_REQUESTS);
         response.headers_mut().insert(