From ba48758b89dba451551fd243ac2abd1276e01df4 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 31 May 2024 01:21:15 +0000
Subject: [PATCH] impl fmt::Display for FedDest

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/admin/debug/debug_commands.rs |  2 +-
 src/service/sending/resolve.rs    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/admin/debug/debug_commands.rs b/src/admin/debug/debug_commands.rs
index 873a23e7..27f259a6 100644
--- a/src/admin/debug/debug_commands.rs
+++ b/src/admin/debug/debug_commands.rs
@@ -448,7 +448,7 @@ pub(crate) async fn resolve_true_destination(
 	let (actual_dest, hostname_uri) = resolve_actual_dest(&server_name, no_cache).await?;
 
 	Ok(RoomMessageEventContent::text_plain(format!(
-		"Actual destination: {actual_dest:?} | Hostname URI: {hostname_uri}"
+		"Actual destination: {actual_dest} | Hostname URI: {hostname_uri}"
 	)))
 }
 
diff --git a/src/service/sending/resolve.rs b/src/service/sending/resolve.rs
index d452a555..243180ed 100644
--- a/src/service/sending/resolve.rs
+++ b/src/service/sending/resolve.rs
@@ -1,4 +1,5 @@
 use std::{
+	fmt,
 	fmt::Debug,
 	net::{IpAddr, SocketAddr},
 };
@@ -414,6 +415,15 @@ impl FedDest {
 	}
 }
 
+impl fmt::Display for FedDest {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		match self {
+			FedDest::Named(host, port) => write!(f, "{host}{port}"),
+			FedDest::Literal(addr) => write!(f, "{addr}"),
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::{add_port_to_hostname, get_ip_with_port, FedDest};