refactor: Ruma upstreaming, half-baked edition

Co-authored-by: Jade Ellis <jade@ellis.link>

src/service/resolver/cache.rs

@@ -8,7 +8,7 @@ use conduwuit::{
 };
 use database::{Cbor, Deserialized, Map};
 use futures::{Stream, StreamExt, future::join};
-use ruma::ServerName;
+use ruma::{OwnedServerName, ServerName};
 use serde::{Deserialize, Serialize};
 
 use super::fed::FedDest;
@@ -107,19 +107,19 @@ pub async fn get_override(&self, name: &str) -> Result<CachedOverride> {
 }
 
 #[implement(Cache)]
-pub fn destinations(&self) -> impl Stream<Item = (&ServerName, CachedDest)> + Send + '_ {
+pub fn destinations(&self) -> impl Stream<Item = (OwnedServerName, CachedDest)> + Send + '_ {
 	self.destinations
 		.stream()
 		.ignore_err()
-		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1.0))
+		.map(|item: (OwnedServerName, Cbor<_>)| (item.0, item.1.0))
 }
 
 #[implement(Cache)]
-pub fn overrides(&self) -> impl Stream<Item = (&ServerName, CachedOverride)> + Send + '_ {
+pub fn overrides(&self) -> impl Stream<Item = (OwnedServerName, CachedOverride)> + Send + '_ {
 	self.overrides
 		.stream()
 		.ignore_err()
-		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1.0))
+		.map(|item: (OwnedServerName, Cbor<_>)| (item.0, item.1.0))
 }
 
 impl CachedDest {

src/service/resolver/well_known.rs

@@ -1,6 +1,9 @@
+use std::str::FromStr;
+
 use conduwuit::{
 	Result, debug, debug_error, debug_info, implement, trace, utils::response::LimitReadExt,
 };
+use ruma::{OwnedServerName, ServerName};
 
 #[implement(super::Service)]
 #[tracing::instrument(name = "well-known", level = "debug", skip(self, dest))]
@@ -40,7 +43,7 @@ pub(super) async fn request_well_known(&self, dest: &str) -> Result<Option<Strin
 		.as_str()
 		.unwrap_or_default();
 
-	if ruma::identifiers_validation::server_name::validate(m_server).is_err() {
+	if ServerName::parse(m_server).is_err() {
 		debug_error!("response content missing or invalid");
 		return Ok(None);
 	}