eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-11 16:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ratelimits

Browse source
This commit is contained in:
spiral 2023-03-18 20:44:50 -04:00
parent 4c6217c48b
commit d120a32904
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
services/api/src/middleware/ratelimit.rs
View file

@ -88,7 +88,7 @@ pub async fn do_request_ratelimited<B>(
// local burst = ARGV[1]
// local rate = ARGV[2]
// local period = ARGV[3]
// return {remaining, retry_after, reset_after}
// return {remaining, tostring(retry_after), reset_after}
let resp = redis
.evalsha::<(i32, String, u64), String, Vec<&str>, Vec<i32>>(
scriptsha,
@ -99,14 +99,21 @@ pub async fn do_request_ratelimited<B>(
match resp {
Ok((mut remaining, retry_after, reset_after)) => {
// redis's lua doesn't support returning floats
let retry_after: f64 = retry_after
.parse()
.expect("got something that isn't a f64 from redis");
let mut response = if remaining > 0 {
next.run(request).await
} else {
println!("{}", reset_after);
json_err(
StatusCode::TOO_MANY_REQUESTS,
format!(
// todo: the retry_after is horribly wrong
r#"{{"message":"429: too many requests","retry_after":{retry_after}}}"#
r#"{{"message":"429: too many requests","retry_after":{},"code":0}}"#,
(retry_after * 1_000_f64).ceil() as u64
),
)
};