Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility""

This reverts commit 1d009013b3.
This commit is contained in:
Erik Johnston 2018-06-25 13:42:55 +01:00
parent 1d009013b3
commit 244484bf3c
8 changed files with 213 additions and 25 deletions

View file

@ -254,7 +254,9 @@ class DeactivateAccountRestServlet(ClientV1RestServlet):
if not is_admin:
raise AuthError(403, "You are not a server admin")
yield self._deactivate_account_handler.deactivate_account(target_user_id)
yield self._deactivate_account_handler.deactivate_account(
target_user_id, False,
)
defer.returnValue((200, {}))