mirror of
https://gitlab.com/famedly/conduit.git
synced 2025-07-22 17:18:35 +00:00
don't rate limit appservices if the registration file says they shouldn't be
This commit is contained in:
parent
6a3b194567
commit
1e76cc5cee
2 changed files with 9 additions and 1 deletions
|
@ -324,7 +324,11 @@ where
|
||||||
let target = if let Some(server) = sender_servername.clone() {
|
let target = if let Some(server) = sender_servername.clone() {
|
||||||
Target::Server(server)
|
Target::Server(server)
|
||||||
} else if let Some(appservice) = appservice_info.clone() {
|
} else if let Some(appservice) = appservice_info.clone() {
|
||||||
Target::Appservice(appservice.registration.id)
|
if appservice.registration.rate_limited.unwrap_or(true) {
|
||||||
|
Target::Appservice(appservice.registration.id)
|
||||||
|
} else {
|
||||||
|
Target::None
|
||||||
|
}
|
||||||
} else if let Some(user) = sender_user.clone() {
|
} else if let Some(user) = sender_user.clone() {
|
||||||
Target::User(user)
|
Target::User(user)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -55,6 +55,10 @@ impl Service {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_or_reject(&self, target: Target, metadata: Metadata) -> Result<(), Duration> {
|
pub fn update_or_reject(&self, target: Target, metadata: Metadata) -> Result<(), Duration> {
|
||||||
|
if target == Target::None {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
let restriction = metadata.into();
|
let restriction = metadata.into();
|
||||||
|
|
||||||
let arrival = Instant::now();
|
let arrival = Instant::now();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue