Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-29 02:07:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

update_membership declaration: now always returns an event id. (#7809)

Browse Source
This commit is contained in:
Richard van der Hoff 2020-07-09 13:01:42 +01:00 committed by GitHub
parent 8ca39bd2c3
commit 53ee214f2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7809.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.

8
synapse/handlers/room_member.py
View File

@ -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

2
synapse/handlers/room_member_worker.py
View File

@ -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

6
synapse/rest/client/v1/room.py
View File

@ -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