diff options
author | Erik Johnston <erik@matrix.org> | 2020-10-21 16:50:59 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-10-21 16:53:40 +0100 |
commit | f42fa8b15bf345cc1457077a6cde16193a355b7f (patch) | |
tree | 8857e16914ba36aa82b2cb8243df5f29d7718b3e /synapse/handlers/deactivate_account.py | |
parent | MAU limits are based off of the *authenticated* user (diff) | |
download | synapse-f42fa8b15bf345cc1457077a6cde16193a355b7f.tar.xz |
Correctly set authenticated_entity when creating ad hoc requesters github/erikj/puppet_tokens erikj/puppet_tokens
Diffstat (limited to 'synapse/handlers/deactivate_account.py')
-rw-r--r-- | synapse/handlers/deactivate_account.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/deactivate_account.py b/synapse/handlers/deactivate_account.py index 4efe6c530a..e808142365 100644 --- a/synapse/handlers/deactivate_account.py +++ b/synapse/handlers/deactivate_account.py @@ -39,6 +39,7 @@ class DeactivateAccountHandler(BaseHandler): self._room_member_handler = hs.get_room_member_handler() self._identity_handler = hs.get_identity_handler() self.user_directory_handler = hs.get_user_directory_handler() + self._server_name = hs.hostname # Flag that indicates whether the process to part users from rooms is running self._user_parter_running = False @@ -152,7 +153,7 @@ class DeactivateAccountHandler(BaseHandler): for room in pending_invites: try: await self._room_member_handler.update_membership( - create_requester(user), + create_requester(user, authenticated_entity=self._server_name), user, room.room_id, "leave", @@ -208,7 +209,7 @@ class DeactivateAccountHandler(BaseHandler): logger.info("User parter parting %r from %r", user_id, room_id) try: await self._room_member_handler.update_membership( - create_requester(user), + create_requester(user, authenticated_entity=self._server_name), user, room_id, "leave", |