Merge pull request #4148 from matrix-org/matthew/red_list dinsic_2018-12-19

add im.vector.hide_profile to user account_data

1 files changed, 4 insertions, 2 deletions

diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py

index 10133f0a4a..488e31c8b2 100644
--- a/synapse/storage/profile.py
+++ b/synapse/storage/profile.py
@@ -147,12 +147,14 @@ 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 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(