summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-13 12:48:50 +0100
committerGitHub <noreply@github.com>2017-06-13 12:48:50 +0100
commit6c6b9689bb7397f68ce77813e75f147b331484c1 (patch)
tree390b96a80c8481f6d860d32009ab9ac9c1ae08c5 /synapse/storage
parentMerge pull request #2278 from matrix-org/erikj/fix_user_dir (diff)
parentFix user directory insertion due to missing room_id (diff)
downloadsynapse-6c6b9689bb7397f68ce77813e75f147b331484c1.tar.xz
Merge pull request #2279 from matrix-org/erikj/fix_user_dir
Fix user directory insertion due to missing room_id
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/user_directory.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/user_directory.py b/synapse/storage/user_directory.py
index 67b14cf26a..137aca2881 100644
--- a/synapse/storage/user_directory.py
+++ b/synapse/storage/user_directory.py
@@ -149,12 +149,13 @@ class UserDirectoryStore(SQLBaseStore):
         )
         self.get_user_in_directory.invalidate((user_id,))
 
-    def update_profile_in_user_dir(self, user_id, display_name, avatar_url):
+    def update_profile_in_user_dir(self, user_id, display_name, avatar_url, room_id):
         def _update_profile_in_user_dir_txn(txn):
             new_entry = self._simple_upsert_txn(
                 txn,
                 table="user_directory",
                 keyvalues={"user_id": user_id},
+                insertion_values={"room_id": room_id},
                 values={"display_name": display_name, "avatar_url": avatar_url},
                 lock=False,  # We're only inserter
             )