Skip to content

Commit deaf3d8

Browse files
committed
Fix creating batch sent member events on worker
Signed-off-by: Tulir Asokan <[email protected]>
1 parent f0c73d8 commit deaf3d8

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

synapse/handlers/message.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,13 +1382,14 @@ async def persist_and_notify_client_event(
13821382

13831383
if event.type == EventTypes.Member:
13841384
if event.content["membership"] == Membership.INVITE:
1385-
event.unsigned[
1386-
"invite_room_state"
1387-
] = await self.store.get_stripped_room_state_from_event_context(
1388-
context,
1389-
self.room_prejoin_state_types,
1390-
membership_user_id=event.sender,
1391-
)
1385+
if not event.internal_metadata.outlier:
1386+
event.unsigned[
1387+
"invite_room_state"
1388+
] = await self.store.get_stripped_room_state_from_event_context(
1389+
context,
1390+
self.room_prejoin_state_types,
1391+
membership_user_id=event.sender,
1392+
)
13921393

13931394
invitee = UserID.from_string(event.state_key)
13941395
if not self.hs.is_mine(invitee):
@@ -1405,12 +1406,13 @@ async def persist_and_notify_client_event(
14051406
event.signatures.update(returned_invite.signatures)
14061407

14071408
if event.content["membership"] == Membership.KNOCK:
1408-
event.unsigned[
1409-
"knock_room_state"
1410-
] = await self.store.get_stripped_room_state_from_event_context(
1411-
context,
1412-
self.room_prejoin_state_types,
1413-
)
1409+
if not event.internal_metadata.outlier:
1410+
event.unsigned[
1411+
"knock_room_state"
1412+
] = await self.store.get_stripped_room_state_from_event_context(
1413+
context,
1414+
self.room_prejoin_state_types,
1415+
)
14141416

14151417
if event.type == EventTypes.Redaction:
14161418
original_event = await self.store.get_event(

0 commit comments

Comments
 (0)