From b682443d2414658f56f30030c406fb6a05659f08 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 6 Apr 2023 12:07:00 -0400 Subject: [PATCH] Fix-up one more spot. --- synapse/handlers/message.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index af75d7618126..6adcc98f0c35 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1909,12 +1909,18 @@ async def persist_and_notify_client_events( room_version_obj = KNOWN_ROOM_VERSIONS[room_version] create_event = await self.store.get_create_event_for_room(event.room_id) + if room_version_obj.msc2175_implicit_room_creator: + room_creator = create_event.sender + else: + room_creator = create_event.content.get( + EventContentFields.ROOM_CREATOR + ) # Only check an insertion event if the room version # supports it or the event is from the room creator. if room_version_obj.msc2716_historical or ( self.config.experimental.msc2716_enabled - and event.sender == create_event.sender + and event.sender == room_creator ): next_batch_id = event.content.get( EventContentFields.MSC2716_NEXT_BATCH_ID