backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 08:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop putting comments and code on the same line

Browse source
This commit is contained in:
Charles Hall 2024-05-15 15:40:56 -07:00
parent 0915aba44c
commit 1911ad34d9
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
35 changed files with 305 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/config/proxy.rs
View file

@ -45,7 +45,8 @@ impl ProxyConfig {
ProxyConfig::None => None,
ProxyConfig::Global { url } => Some(Proxy::all(url)?),
ProxyConfig::ByDomain(proxies) => Some(Proxy::custom(move |url| {
proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned() // first matching proxy
// first matching proxy
proxies.iter().find_map(|proxy| proxy.for_url(url)).cloned()
})),
})
}
@ -63,8 +64,10 @@ pub(crate) struct PartialProxyConfig {
impl PartialProxyConfig {
pub(crate) fn for_url(&self, url: &Url) -> Option<&Url> {
let domain = url.domain()?;
let mut included_because = None; // most specific reason it was included
let mut excluded_because = None; // most specific reason it was excluded
// most specific reason it was included
let mut included_because = None;
// most specific reason it was excluded
let mut excluded_because = None;
if self.include.is_empty() {
// treat empty include list as `*`
included_because = Some(&WildCardedDomain::WildCard);
@ -86,7 +89,8 @@ impl PartialProxyConfig {
}
}
match (included_because, excluded_because) {
(Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url), // included for a more specific reason than excluded
// included for a more specific reason than excluded
(Some(a), Some(b)) if a.more_specific_than(b) => Some(&self.url),
(Some(_), None) => Some(&self.url),
_ => None,
}