OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Incorporate review

pull/6125/head
Brendan Abolivier 2019-09-27 16:15:01 +01:00
parent af92110c46
commit 3e42d47a5a
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/deactivate_account.py
View File

@ -120,8 +120,8 @@ class DeactivateAccountHandler(BaseHandler):
# parts users from rooms (if it isn't already running) # parts users from rooms (if it isn't already running)
self._start_user_parting() self._start_user_parting()
# Reject all pending invites for the user, so that they do not show up in the # Reject all pending invites for the user, so that the user doesn't show up in the
# invitees list of rooms. # "invited" section of rooms' members list.
yield self._reject_pending_invites_for_user(user_id) yield self._reject_pending_invites_for_user(user_id)
# Remove all information on the user from the account_validity table. # Remove all information on the user from the account_validity table.
@ -143,8 +143,6 @@ class DeactivateAccountHandler(BaseHandler):
user = UserID.from_string(user_id) user = UserID.from_string(user_id)
pending_invites = yield self.store.get_invited_rooms_for_user(user_id) pending_invites = yield self.store.get_invited_rooms_for_user(user_id)
logger.info(pending_invites)
for room in pending_invites: for room in pending_invites:
try: try:
yield self._room_member_handler.update_membership( yield self._room_member_handler.update_membership(