From 53ee214f2f2ec3519ee37fe7cbcd0961e83678af Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 9 Jul 2020 13:01:42 +0100
Subject: [PATCH] `update_membership` declaration: now always returns an event
id. (#7809)
---
changelog.d/7809.bugfix | 1 +
synapse/handlers/room_member.py | 8 ++++----
synapse/handlers/room_member_worker.py | 2 +-
synapse/rest/client/v1/room.py | 6 ++----
4 files changed, 8 insertions(+), 9 deletions(-)
create mode 100644 changelog.d/7809.bugfix
diff --git a/changelog.d/7809.bugfix b/changelog.d/7809.bugfix
new file mode 100644
index 0000000000..2772eeb0db
--- /dev/null
+++ b/changelog.d/7809.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
index 41adaf3bf3..a1a8fa1d3b 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -109,7 +109,7 @@ class RoomMemberHandler(object):
txn_id: Optional[str],
requester: Requester,
content: JsonDict,
- ) -> Tuple[Optional[str], int]:
+ ) -> Tuple[str, int]:
"""
Rejects an out-of-band invite we have received from a remote server
@@ -268,7 +268,7 @@ class RoomMemberHandler(object):
ratelimit: bool = True,
content: Optional[dict] = None,
require_consent: bool = True,
- ) -> Tuple[Optional[str], int]:
+ ) -> Tuple[str, int]:
key = (room_id,)
with (await self.member_linearizer.queue(key)):
@@ -299,7 +299,7 @@ class RoomMemberHandler(object):
ratelimit: bool = True,
content: Optional[dict] = None,
require_consent: bool = True,
- ) -> Tuple[Optional[str], int]:
+ ) -> Tuple[str, int]:
content_specified = bool(content)
if content is None:
content = {}
@@ -1006,7 +1006,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
txn_id: Optional[str],
requester: Requester,
content: JsonDict,
- ) -> Tuple[Optional[str], int]:
+ ) -> Tuple[str, int]:
"""
Rejects an out-of-band invite received from a remote user
diff --git a/synapse/handlers/room_member_worker.py b/synapse/handlers/room_member_worker.py
index ac03f15166..897338fd54 100644
--- a/synapse/handlers/room_member_worker.py
+++ b/synapse/handlers/room_member_worker.py
@@ -67,7 +67,7 @@ class RoomMemberWorkerHandler(RoomMemberHandler):
txn_id: Optional[str],
requester: Requester,
content: dict,
- ) -> Tuple[Optional[str], int]:
+ ) -> Tuple[str, int]:
"""
Rejects an out-of-band invite received from a remote user
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 46811abbfa..f40ed82142 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -217,10 +217,8 @@ class RoomStateEventRestServlet(TransactionRestServlet):
)
event_id = event.event_id
- ret = {} # type: dict
- if event_id:
- set_tag("event_id", event_id)
- ret = {"event_id": event_id}
+ set_tag("event_id", event_id)
+ ret = {"event_id": event_id}
return 200, ret
--
GitLab