diff options
| author | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
| commit | 077b74929f8f412395d1156e1b97eb16701059fa (patch) | |
| tree | 25ecb8e93ec3ba275596bfb31efa45018645d47b /synapse/handlers/room_member.py | |
| parent | Correct target of link to the modules page from the Password Auth Providers p... (diff) | |
| parent | 1.47.0 (diff) | |
| download | synapse-077b74929f8f412395d1156e1b97eb16701059fa.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.47'
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 74e6c7eca6..08244b690d 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -1669,7 +1669,9 @@ class RoomMemberMasterHandler(RoomMemberHandler): # # the prev_events consist solely of the previous membership event. prev_event_ids = [previous_membership_event.event_id] - auth_event_ids = previous_membership_event.auth_event_ids() + prev_event_ids + auth_event_ids = ( + list(previous_membership_event.auth_event_ids()) + prev_event_ids + ) event, context = await self.event_creation_handler.create_event( requester, |