diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs index 2da92752b..d9b7a38c8 100644 --- a/src/api/server/make_join.rs +++ b/src/api/server/make_join.rs @@ -75,14 +75,6 @@ pub(crate) async fn create_join_event_template_route( return Err!(Request(Forbidden("Server is banned on this homeserver."))); } - if let Some(server) = body.room_id.server_name() { - if services.moderation.is_remote_server_forbidden(server) { - return Err!(Request(Forbidden(warn!( - "Room ID server name {server} is banned on this homeserver." - )))); - } - } - let room_version = services.rooms.state.get_room_version(&body.room_id).await?; let room_version_rules = room_version.rules().unwrap(); if !body.ver.contains(&room_version) { diff --git a/src/api/server/make_knock.rs b/src/api/server/make_knock.rs index d6cadf02d..4c918daa8 100644 --- a/src/api/server/make_knock.rs +++ b/src/api/server/make_knock.rs @@ -58,12 +58,6 @@ pub(crate) async fn create_knock_event_template_route( return Err!(Request(Forbidden("Server is banned on this homeserver."))); } - if let Some(server) = body.room_id.server_name() { - if services.moderation.is_remote_server_forbidden(server) { - return Err!(Request(Forbidden("Server is banned on this homeserver."))); - } - } - let room_version = services.rooms.state.get_room_version(&body.room_id).await?; let room_version_rules = room_version.rules().unwrap(); diff --git a/src/api/server/make_leave.rs b/src/api/server/make_leave.rs index 168e235d7..1a472aa69 100644 --- a/src/api/server/make_leave.rs +++ b/src/api/server/make_leave.rs @@ -27,6 +27,7 @@ pub(crate) async fn create_leave_event_template_route( { info!( origin = body.identity.as_str(), + room_id = %body.room_id, "Refusing to serve make_leave for room we aren't participating in" ); return Err!(Request(NotFound("This server is not participating in that room.")));