add im.vector.hide_profile to user account_data

This commit is contained in:
Matthew Hodgson 2018-11-04 23:46:11 +00:00
parent 7ed3232b08
commit ae5bb32ad0
4 changed files with 14 additions and 6 deletions

View file

@ -96,7 +96,7 @@ class DeactivateAccountHandler(BaseHandler):
yield self.store.user_set_password_hash(user_id, None)
user = UserID.from_string(user_id)
yield self._profile_handler.set_active(user, False)
yield self._profile_handler.set_active(user, False, False)
# Add the user to a table of users pending deactivation (ie.
# removal from all the rooms they're a member of)

View file

@ -270,10 +270,13 @@ class BaseProfileHandler(BaseHandler):
run_in_background(self._replicate_profiles)
@defer.inlineCallbacks
def set_active(self, target_user, active):
def set_active(self, target_user, active, hide):
"""
Sets the 'active' flag on a user profile. If set to false, the user account is
considered deactivated.
considered deactivated or hidden.
If 'hide' is true, then we just try hide the user rather than deactivate it.
This means withholding it from replication (and mark it as inactive) rather than
clearing the profile from the HS DB.
Note that unlike set_displayname and set_avatar_url, this does *not* perform
authorization checks! This is because the only place it's used currently is
in account deactivation where we've already done these checks anyway.
@ -284,7 +287,7 @@ class BaseProfileHandler(BaseHandler):
else:
new_batchnum = None
yield self.store.set_profile_active(
target_user.localpart, active, new_batchnum
target_user.localpart, active, hide, new_batchnum
)
# start a profile replication push

View file

@ -47,6 +47,11 @@ class AccountDataServlet(RestServlet):
body = parse_json_object_from_request(request)
if account_data_type == "im.vector.hide_profile":
user = UserID.from_string(user_id)
hide_profile = body.get('hide_profile')
yield self._profile_handler.set_active(user, hide_profile, True)
max_id = yield self.store.add_account_data_for_user(
user_id, account_data_type, body
)

View file

@ -147,12 +147,12 @@ class ProfileWorkerStore(SQLBaseStore):
lock=False # we can do this because user_id has a unique index
)
def set_profile_active(self, user_localpart, active, batchnum):
def set_profile_active(self, user_localpart, active, hide, batchnum):
values = {
"active": int(active),
"batch": batchnum,
}
if not active:
if not active and hide:
values["avatar_url"] = None
values["displayname"] = None
return self._simple_upsert(