MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-16 23:11:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix can only concatenate list (not "tuple") to list exception (#7810)

Browse source 
It seems auth_events can be either a list or a tuple, depending on Things.
This commit is contained in:
Richard van der Hoff 2020-07-09 12:48:15 +01:00 committed by GitHub
parent 8fa7fdd4cb
commit 08c5181a8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/7810.bugfix Normal file
View file

@ -0,0 +1 @@
Fix 'stuck invites' which happen when we are unable to reject a room invite received over federation.

2
synapse/handlers/room_member.py
View file

@ -1072,7 +1072,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
alg, h = compute_event_reference_hash(invite_event) alg, h = compute_event_reference_hash(invite_event)
invite_hash = (invite_event.event_id, {alg: encode_base64(h)}) invite_hash = (invite_event.event_id, {alg: encode_base64(h)})
auth_events = invite_event.auth_events + (invite_hash,) auth_events = tuple(invite_event.auth_events) + (invite_hash,)
prev_events = (invite_hash,) prev_events = (invite_hash,)
# we cap depth of generated events, to ensure that they are not # we cap depth of generated events, to ensure that they are not