From 31982e84de470117d10c941a776872bb4b6f4384 Mon Sep 17 00:00:00 2001 From: timedout Date: Sat, 30 May 2026 17:12:40 +0100 Subject: [PATCH] fix: Remove redundant check 2 This may look scary, but this is safe because event auth performs the same check, and will reject the event if it doesn't reference the create event correctly. --- src/service/rooms/event_handler/fetch_state.rs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/service/rooms/event_handler/fetch_state.rs b/src/service/rooms/event_handler/fetch_state.rs index a4feaaa66..1fed99d52 100644 --- a/src/service/rooms/event_handler/fetch_state.rs +++ b/src/service/rooms/event_handler/fetch_state.rs @@ -10,7 +10,6 @@ use futures::StreamExt; use ruma::{ EventId, OwnedEventId, RoomId, ServerName, api::federation::event::{get_room_state, get_room_state_ids}, - events::StateEventType, }; use crate::{conduwuit::utils::stream::BroadbandExt, rooms::short::ShortStateKey}; @@ -158,22 +157,6 @@ impl super::Service { } } - // The original create event must still be in the state - let create_shortstatekey = self - .services - .short - .get_shortstatekey(&StateEventType::RoomCreate, "") - .await?; - - let create_event_id = state.get(&create_shortstatekey).map(AsRef::as_ref); - if create_event_id != Some(create_event.event_id()) { - return Err!(Request(Forbidden( - "Incoming event refers to wrong create event: expected {}, got: \ - {create_event_id:?}", - create_event.event_id() - ))); - } - Ok(Some(state)) }