From deaf3d8934709caa507b2b6beeafb850a2e10660 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 2 Nov 2021 12:18:39 +0200 Subject: [PATCH] Fix creating batch sent member events on worker Signed-off-by: Tulir Asokan --- synapse/handlers/message.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 4a0fccfcc6ac..0676d05b0156 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1382,13 +1382,14 @@ async def persist_and_notify_client_event( if event.type == EventTypes.Member: if event.content["membership"] == Membership.INVITE: - event.unsigned[ - "invite_room_state" - ] = await self.store.get_stripped_room_state_from_event_context( - context, - self.room_prejoin_state_types, - membership_user_id=event.sender, - ) + if not event.internal_metadata.outlier: + event.unsigned[ + "invite_room_state" + ] = await self.store.get_stripped_room_state_from_event_context( + context, + self.room_prejoin_state_types, + membership_user_id=event.sender, + ) invitee = UserID.from_string(event.state_key) if not self.hs.is_mine(invitee): @@ -1405,12 +1406,13 @@ async def persist_and_notify_client_event( event.signatures.update(returned_invite.signatures) if event.content["membership"] == Membership.KNOCK: - event.unsigned[ - "knock_room_state" - ] = await self.store.get_stripped_room_state_from_event_context( - context, - self.room_prejoin_state_types, - ) + if not event.internal_metadata.outlier: + event.unsigned[ + "knock_room_state" + ] = await self.store.get_stripped_room_state_from_event_context( + context, + self.room_prejoin_state_types, + ) if event.type == EventTypes.Redaction: original_event = await self.store.get_event(