From 6f67c275382a1d58df23b894945c17b1380efe0a Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Thu, 18 Dec 2025 23:35:52 +0000 Subject: [PATCH] fix: Ensure that room ID is present on state events sent to client routes Mostly fixes !1094 The remaining issue is federation routes --- src/api/client/state.rs | 2 +- src/core/matrix/event/format.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/client/state.rs b/src/api/client/state.rs index 92e155e6..c411e32c 100644 --- a/src/api/client/state.rs +++ b/src/api/client/state.rs @@ -158,7 +158,7 @@ pub(crate) async fn get_state_events_for_key_route( "content": event.content(), "event_id": event.event_id(), "origin_server_ts": event.origin_server_ts(), - "room_id": event.room_id(), + "room_id": event.room_id_or_hash(), "sender": event.sender(), "state_key": event.state_key(), "type": event.kind(), diff --git a/src/core/matrix/event/format.rs b/src/core/matrix/event/format.rs index 988cf4f0..32c4cf06 100644 --- a/src/core/matrix/event/format.rs +++ b/src/core/matrix/event/format.rs @@ -56,7 +56,7 @@ impl<'a, E: Event> From> for Raw { "content": content, "event_id": event.event_id(), "origin_server_ts": event.origin_server_ts(), - "room_id": event.room_id(), + "room_id": event.room_id_or_hash(), "sender": event.sender(), "type": event.kind(), }); @@ -117,7 +117,7 @@ impl<'a, E: Event> From> for Raw { "content": event.content(), "event_id": event.event_id(), "origin_server_ts": event.origin_server_ts(), - "room_id": event.room_id(), + "room_id": event.room_id_or_hash(), "sender": event.sender(), "state_key": event.state_key(), "type": event.kind(),