Compare commits

...

2 Commits

Author SHA1 Message Date
Andrew Morgan acc1899786 Yes, we are still returning things 2020-11-13 16:27:42 +00:00
Andrew Morgan 19e33041e9 any membership -> leave 2020-11-13 16:26:42 +00:00
2 changed files with 4 additions and 4 deletions

View File

@ -1 +1 @@
Generalise `RoomMemberHandler._locally_reject_invite` for any membership type. Generalise `RoomMemberHandler._locally_reject_invite` to apply to more flows than just invite.

View File

@ -1104,17 +1104,17 @@ class RoomMemberMasterHandler(RoomMemberHandler):
# #
logger.warning("Failed to reject invite: %s", e) 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 invite_event, txn_id, requester, content
) )
async def _generate_local_out_of_band_membership( async def _generate_local_out_of_band_leave(
self, self,
previous_membership_event: EventBase, previous_membership_event: EventBase,
txn_id: Optional[str], txn_id: Optional[str],
requester: Requester, requester: Requester,
content: JsonDict, content: JsonDict,
): ) -> Tuple[str, int]:
"""Generate a local leave event for a room """Generate a local leave event for a room
This can be called after we e.g fail to reject an invite via a remote server. This can be called after we e.g fail to reject an invite via a remote server.