mirror of
https://forgejo.ellis.link/continuwuation/continuwuity/
synced 2026-07-21 14:30:55 +00:00
theS1LV3R
3d521c8898
diff --git c/Cargo.lock i/Cargo.lock index 4a8b1e273..239932c62 100644 --- c/Cargo.lock +++ i/Cargo.lock @@ -4601,9 +4601,9 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "resolvematrix" -version = "0.0.3" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dfcc6f56a81348db1fc6591356cfea9dc840408c75553b2fe225f86de43274" +checksum = "ea2b9bc3cb1220455bf50519f315c27257859059cb1b0f1643758afd03cbef8a" dependencies = [ "hickory-resolver", "reqwest 0.13.2", diff --git c/Cargo.toml i/Cargo.toml index f89a5e010..d6260177a 100644 --- c/Cargo.toml +++ i/Cargo.toml @@ -45,7 +45,7 @@ version = "1.0.6" version = "1.0.0" [workspace.dependencies.cargo_toml] -version = "1.0" +version = "0.22" default-features = false features = ["features"] @@ -164,7 +164,7 @@ features = ["raw_value"] # Used for appservice registration files [workspace.dependencies.serde-saphyr] -version = "0.0.28" +version = "0.0.27" # Used to load forbidden room/user regex from config [workspace.dependencies.serde_regex] @@ -356,7 +356,6 @@ features = [ "ring-compat", "compat-upload-signatures", "compat-optional-txn-pdus", - "compat-get-3pids", "unstable-msc2666", "unstable-msc2867", "unstable-msc2870", @@ -561,10 +560,7 @@ features = ["std"] version = "0.3.0" [workspace.dependencies.resolvematrix] -version = "0.1.0" - -[workspace.dependencies.serde_urlencoded] -version = "0.7.1" +version = "0.0.4" # # Patches diff --git c/src/admin/query/resolver.rs i/src/admin/query/resolver.rs index 4a88650f8..add4c70de 100644 --- c/src/admin/query/resolver.rs +++ i/src/admin/query/resolver.rs @@ -92,9 +92,11 @@ async fn overrides_cache(&self, server_name: Option<String>) -> Result { async fn flush_cache(&self, name: Option<OwnedServerName>, all: bool) -> Result { if all { - self.services.resolver.dns.cache.clear().await; - writeln!(self, "Resolver caches cleared!").await - } else if let Some(name) = name { + self.services.resolver.resolver.clear_cache(); + self.services.resolver.dns.cache.clear().await; + writeln!(self, "Resolver caches cleared!").await + } else if let Some(name) = name { + self.services.resolver.resolver.remove_cache_entry(&name.as_str()); self.services.resolver.dns.cache.del_destination(&name); self.services.resolver.dns.cache.del_override(&name); self.write_str(&format!("Cleared {name} from resolver caches!")) diff --git c/src/service/resolver/mod.rs i/src/service/resolver/mod.rs index c24b8ba60..6b57013dd 100644 --- c/src/service/resolver/mod.rs +++ i/src/service/resolver/mod.rs @@ -45,7 +45,7 @@ fn build(args: crate::Args<'_>) -> Result<Arc<Self>> { } async fn clear_cache(&self) { - // No ability to clean resolvematrix cache at the moment + self.resolver.clear_cache(); self.dns.resolver.clear_cache(); self.dns.cache.clear().await; }