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.
matrix-org · Jul 9, 2020 · 08c5181 · 08c5181
1 parent 8fa7fdd
commit 08c5181
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/7810.bugfix b/changelog.d/7810.bugfix
@@ -0,0 +1 @@
+Fix 'stuck invites' which happen when we are unable to reject a room invite received over federation.
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
@@ -1072,7 +1072,7 @@ async def _locally_reject_invite(
             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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix 'stuck invites' which happen when we are unable to reject a room invite received over federation.