fix: Fix circular service dependency

This commit is contained in:
Ginger committed 2026-07-04 17:04:01 -04:00
1 parent 6aab456466
commit 632d90921b
3 files changed
+14 -15

No files matched your search

+12 -3
View File
@@ -2,14 +2,15 @@ pub mod cache;
mod dns;
pub mod fed;
use std::sync::Arc;
use std::{sync::Arc, time::Duration};
use async_trait::async_trait;
use conduwuit::Result;
use reqwest::redirect;
use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder};
use self::{cache::Cache, dns::Resolver};
use crate::client;
use crate::client::base;
pub struct Service {
pub resolver: MatrixResolver,
@@ -34,7 +35,15 @@ impl crate::Service for Service {
Ok(Arc::new(Self {
resolver: MatrixResolverBuilder::new()
.dangerous_tls_accept_invalid_certs(args.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure)
.http_client(args.depend::<client::Service>("client").well_known.clone())
.http_client(
base(&args.server.config)?
.connect_timeout(Duration::from_secs(args.server.config.well_known_conn_timeout))
.read_timeout(Duration::from_secs(args.server.config.well_known_timeout))
.timeout(Duration::from_secs(args.server.config.well_known_timeout))
.pool_max_idle_per_host(0)
.redirect(redirect::Policy::limited(4))
.build()?
)
.dns_resolver(resolver.resolver.clone())
.build()?,
dns: Dns {