fix: Remove unused code, use builder when not using cache

src/admin/debug/commands.rs

@@ -20,7 +20,10 @@ use conduwuit::{
 };
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use lettre::message::Mailbox;
-use resolvematrix::{resolution::ResolvedDestination, server::MatrixResolver};
+use resolvematrix::{
+	resolution::ResolvedDestination,
+	server::{MatrixResolver, MatrixResolverBuilder},
+};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
 	OwnedRoomOrAliasId, OwnedServerName, RoomId, RoomVersionId, UInt,
@@ -1009,7 +1012,10 @@ impl crate::Context<'_> {
 		}
 
 		let resolver: &MatrixResolver = if no_cache {
-			&MatrixResolver::new()?
+			&MatrixResolverBuilder::new()
+				.dangerous_tls_accept_invalid_certs(self.services.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(self.services.client.well_known.clone())
+				.build()?
 		} else {
 			&self.services.resolver.resolver
 		};

src/service/resolver/mod.rs

@@ -9,17 +9,16 @@ use conduwuit::Result;
 use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder};
 
 use self::{cache::Cache, dns::Resolver};
-use crate::{Dep, client};
+use crate::client;
 
 pub struct Service {
 	pub resolver: MatrixResolver,
 	pub dns: Dns,
+	#[allow(dead_code)] // This service doesn't access services after construction
 	services: Services,
 }
 
-struct Services {
-	client: Dep<client::Service>,
-}
+struct Services {}
 
 pub struct Dns {
 	pub cache: Arc<Cache>,
@@ -41,9 +40,7 @@ impl crate::Service for Service {
 				cache,
 				resolver,
 			},
-			services: Services {
-				client: args.depend::<client::Service>("client"),
-			},
+			services: Services {},
 		}))
 	}