fix: Fix merge problems, update to resolvematrix 0.1.0

Cargo.toml

@@ -560,7 +560,7 @@ features = ["std"]
 version = "0.3.0"
 
 [workspace.dependencies.resolvematrix]
-version = "0.0.4"
+version = "0.1.0"
 
 #
 # Patches

src/admin/debug/commands.rs

@@ -20,7 +20,7 @@ use conduwuit::{
 };
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use lettre::message::Mailbox;
-use resolvematrix::server::{MatrixResolver, ResolvedDestination};
+use resolvematrix::{resolution::ResolvedDestination, server::MatrixResolver};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
 	OwnedRoomOrAliasId, OwnedServerName, RoomId, RoomVersionId, UInt,

src/core/error/mod.rs

@@ -88,7 +88,7 @@ pub enum Error {
 	#[error(transparent)]
 	YamlSer(#[from] serde_saphyr::ser_error::Error),
 	#[error(transparent)]
-	ResolveServer(#[from] resolvematrix::server::ResolveServerError),
+	ResolveServer(#[from] resolvematrix::error::ResolveServerError),
 
 	// ruma/conduwuit
 	#[error("Arithmetic operation failed: {0}")]

src/service/federation/execute.rs

@@ -19,7 +19,7 @@ use ruma::{
 	},
 };
 
-use crate::{SUPPORTED_VERSIONS, resolver::actual::ActualDest};
+use crate::SUPPORTED_VERSIONS;
 
 impl super::Service {
 	/// Sends a signed request to a remote server over federation.
@@ -131,10 +131,15 @@ impl super::Service {
 			))));
 		}
 
-		let actual = self.services.resolver.get_actual_dest(dest).await?;
+		let actual = self
+		.services
+		.resolver
+		.resolver
+		.resolve_server(dest.as_str())
+		.await?;
 
 		let request = Request::try_from(request.try_into_http_request::<Vec<u8>>(
-			actual.string().as_str(),
+			actual.base_url().as_str(),
 			authentication,
 			PathBuilderInput::create(),
 		)?)?;

src/service/resolver/mod.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use conduwuit::{Err, Result, implement};
 use ipaddress::IPAddress;
-use resolvematrix::server::MatrixResolver;
+use resolvematrix::server::{MatrixResolver, MatrixResolverBuilder};
 
 use self::{cache::Cache, dns::Resolver};
 use crate::{Dep, client};
@@ -32,11 +32,14 @@ impl crate::Service for Service {
 	#[allow(clippy::as_conversions, clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 	fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
 		let cache = Cache::new(&args);
+		let resolver = Resolver::build(args.server, cache.clone())?;
 		Ok(Arc::new(Self {
-			resolver: MatrixResolver::new()?,
+			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)
+				.build()?,
 			dns: Dns {
 				cache: cache.clone(),
-				resolver: Resolver::build(args.server, cache)?,
+				resolver: resolver.clone(),
 			},
 			services: Services {
 				client: args.depend::<client::Service>("client"),