diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-12-12 00:57:39 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-12-12 00:57:39 +0000 |
| commit | 82886e4c8f0a639dba38ba91b625bee12b8c2357 (patch) | |
| tree | b52a3d676e86bcdf3de81826d31f756d7521b946 /synapse | |
| parent | fix sense of 'hide' (diff) | |
| download | synapse-matthew/red_list.tar.xz | |
hide_profile: false should mean not to hide the profile :/ github/matthew/red_list matthew/red_list
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/profile.py | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account_data.py | 2 | ||||
| -rw-r--r-- | synapse/storage/profile.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 58e9181f01..0a952dab97 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -274,9 +274,9 @@ class BaseProfileHandler(BaseHandler): """ Sets the 'active' flag on a user profile. If set to false, the user account is 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. + If 'hide' is true, then we interpret active=False as a request to try to hide the + user rather than deactivating it. This means withholding the profile 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. diff --git a/synapse/rest/client/v2_alpha/account_data.py b/synapse/rest/client/v2_alpha/account_data.py index f4cab67560..21c734e525 100644 --- a/synapse/rest/client/v2_alpha/account_data.py +++ b/synapse/rest/client/v2_alpha/account_data.py @@ -52,7 +52,7 @@ class AccountDataServlet(RestServlet): 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) + yield self._profile_handler.set_active(user, not hide_profile, True) max_id = yield self.store.add_account_data_for_user( user_id, account_data_type, body diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py index a8fbc604b6..488e31c8b2 100644 --- a/synapse/storage/profile.py +++ b/synapse/storage/profile.py @@ -153,6 +153,8 @@ class ProfileWorkerStore(SQLBaseStore): "batch": batchnum, } if not active and not hide: + # we are deactivating for real (not in hide mode) + # so clear the profile. values["avatar_url"] = None values["displayname"] = None return self._simple_upsert( |