kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add fallback if no rate limit header received

This commit is contained in:
bitfl0wer 2023-04-15 14:55:50 +02:00
parent ce075524c8
commit c01adc28fa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/limit.rs
View File

@ -118,15 +118,15 @@ impl LimitedRequester {
// TODO: Make this work // TODO: Make this work
let remaining = match response.headers().get("X-RateLimit-Remaining") { let remaining = match response.headers().get("X-RateLimit-Remaining") {
Some(remaining) => remaining.to_str().unwrap().parse::<u64>().unwrap(), Some(remaining) => remaining.to_str().unwrap().parse::<u64>().unwrap(),
None => return, //false, None => self.limits_rate.get(&limit_type).unwrap().remaining - 1,
}; };
let limit = match response.headers().get("X-RateLimit-Limit") { let limit = match response.headers().get("X-RateLimit-Limit") {
Some(limit) => limit.to_str().unwrap().parse::<u64>().unwrap(), Some(limit) => limit.to_str().unwrap().parse::<u64>().unwrap(),
None => return, //false, None => self.limits_rate.get(&limit_type).unwrap().limit,
}; };
let reset = match response.headers().get("X-RateLimit-Reset") { let reset = match response.headers().get("X-RateLimit-Reset") {
Some(reset) => reset.to_str().unwrap().parse::<u64>().unwrap(), Some(reset) => reset.to_str().unwrap().parse::<u64>().unwrap(),
None => return, //false, None => self.limits_rate.get(&limit_type).unwrap().reset,
}; };
let mut limits_copy = self.limits_rate.clone(); let mut limits_copy = self.limits_rate.clone();
@ -147,11 +147,11 @@ impl LimitedRequester {
LimitType::Ip => {} LimitType::Ip => {}
LimitType::AuthLogin => { LimitType::AuthLogin => {
let entry = limits_copy.get_mut(&LimitType::AuthLogin).unwrap(); let entry = limits_copy.get_mut(&LimitType::AuthLogin).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
} }
LimitType::AbsoluteRegister => { LimitType::AbsoluteRegister => {
let entry = limits_copy.get_mut(&LimitType::AbsoluteRegister).unwrap(); let entry = limits_copy.get_mut(&LimitType::AbsoluteRegister).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
// AbsoluteRegister and AuthRegister both need to be updated, if a Register event // AbsoluteRegister and AuthRegister both need to be updated, if a Register event
// happens. // happens.
limits_copy limits_copy
@ -161,7 +161,7 @@ impl LimitedRequester {
} }
LimitType::AuthRegister => { LimitType::AuthRegister => {
let entry = limits_copy.get_mut(&LimitType::AuthRegister).unwrap(); let entry = limits_copy.get_mut(&LimitType::AuthRegister).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
// AbsoluteRegister and AuthRegister both need to be updated, if a Register event // AbsoluteRegister and AuthRegister both need to be updated, if a Register event
// happens. // happens.
limits_copy limits_copy
@ -171,19 +171,19 @@ impl LimitedRequester {
} }
LimitType::AbsoluteMessage => { LimitType::AbsoluteMessage => {
let entry = limits_copy.get_mut(&LimitType::AbsoluteMessage).unwrap(); let entry = limits_copy.get_mut(&LimitType::AbsoluteMessage).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
} }
LimitType::Channel => { LimitType::Channel => {
let entry = limits_copy.get_mut(&LimitType::Channel).unwrap(); let entry = limits_copy.get_mut(&LimitType::Channel).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
} }
LimitType::Guild => { LimitType::Guild => {
let entry = limits_copy.get_mut(&LimitType::Guild).unwrap(); let entry = limits_copy.get_mut(&LimitType::Guild).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
} }
LimitType::Webhook => { LimitType::Webhook => {
let entry = limits_copy.get_mut(&LimitType::Webhook).unwrap(); let entry = limits_copy.get_mut(&LimitType::Webhook).unwrap();
LimitedRequester::update_limit_entry(entry, reset, limit, limit); LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
} }
} }
} }