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

It seems auth_events can be either a list or a tuple, depending on Things.
This commit is contained in:
Richard van der Hoff authored and GitHub committed 2020-07-09 12:48:15 +01:00
1 parent 8fa7fdd4cb
commit 08c5181a8d
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -0,0 +1 @@
Fix 'stuck invites' which happen when we are unable to reject a room invite received over federation.
+1 -1
View File
@@ -1072,7 +1072,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
alg, h = compute_event_reference_hash(invite_event)
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,)
# we cap depth of generated events, to ensure that they are not