summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-07-09 12:48:15 +0100
committerGitHub <noreply@github.com>2020-07-09 12:48:15 +0100
commit08c5181a8dfcc3977c422797b876bcfddf75ab4f (patch)
tree277f6b03d95f762a964c4900f330df30705c3b17 /synapse
parentPass original request headers from workers to the main process. (#7797) (diff)
downloadsynapse-08c5181a8dfcc3977c422797b876bcfddf75ab4f.tar.xz
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.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room_member.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 178d7db94e..41adaf3bf3 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -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