reduce code complexity& duplication, fix oversight
This commit is contained in:
parent
15d9c9af7e
commit
599407373e
42
src/limit.rs
42
src/limit.rs
|
@ -81,19 +81,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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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
|
||||||
|
@ -103,11 +95,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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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
|
||||||
|
@ -117,35 +105,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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
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();
|
||||||
if reset != entry.reset {
|
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
||||||
LimitedRequester::update_limit_entry(entry, reset, limit, limit);
|
|
||||||
} else {
|
|
||||||
LimitedRequester::update_limit_entry(entry, reset, remaining, limit);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue