From 19e33041e99f3e3de54b14ccebc15a24bc9d69f7 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 13 Nov 2020 16:26:42 +0000 Subject: [PATCH] any membership -> leave --- changelog.d/8751.misc | 2 +- synapse/handlers/room_member.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.d/8751.misc b/changelog.d/8751.misc index 6ca9521f4e..204c280c0e 100644 --- a/changelog.d/8751.misc +++ b/changelog.d/8751.misc @@ -1 +1 @@ -Generalise `RoomMemberHandler._locally_reject_invite` for any membership type. \ No newline at end of file +Generalise `RoomMemberHandler._locally_reject_invite` to apply to more flows than just invite. \ No newline at end of file diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 76ed80d4dc..70f98048d7 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -1104,11 +1104,11 @@ class RoomMemberMasterHandler(RoomMemberHandler): # logger.warning("Failed to reject invite: %s", e) - return await self._generate_local_out_of_band_membership( + return await self._generate_local_out_of_band_leave( invite_event, txn_id, requester, content ) - async def _generate_local_out_of_band_membership( + async def _generate_local_out_of_band_leave( self, previous_membership_event: EventBase, txn_id: Optional[str],