From d3022b41121afeabd22a5af478f80fb1eb5b2a4e Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Sun, 20 Apr 2025 02:46:16 +0100
Subject: [PATCH] Prevent creating custom room IDs belonging to other servers

---
 src/api/client/room/create.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs
index bba5939e..2bc6033c 100644
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@@ -621,6 +621,11 @@ fn custom_room_id_check(services: &Services, custom_room_id: &str) -> Result<Own
 
 	OwnedRoomId::parse(room_id)
 		.map_err(Into::into)
-		.inspect(|full_room_id| debug_info!(?full_room_id, "Full custom room ID"))
+		.inspect(|full_room_id| {
+			debug_info!(?full_room_id, "Full custom room ID");
+			if full_room_id.server_name().expect("failed to extract server name from room ID") != server_name {
+				error!("Custom room ID does not match server name");
+			}
+		})
 		.inspect_err(|e| warn!(?e, ?custom_room_id, "Failed to create room with custom room ID",))
 }