summary refs log tree commit diff
path: root/synapse/storage/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-22 11:47:08 +0100
committerErik Johnston <erik@matrix.org>2018-08-22 11:47:08 +0100
commit2f141f4c41b0bd8d8802f558f3ab4017c51a1684 (patch)
tree8be9a64740b248673f9ccadaf407ded5160af121 /synapse/storage/profile.py
parentMerge branch 'rav/fix_gdpr_consent' into matrix-org-hotfixes (diff)
parentMerge pull request #3659 from matrix-org/erikj/split_profiles (diff)
downloadsynapse-2f141f4c41b0bd8d8802f558f3ab4017c51a1684.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/profile.py')
-rw-r--r--synapse/storage/profile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py

index 60295da254..88b50f33b5 100644 --- a/synapse/storage/profile.py +++ b/synapse/storage/profile.py
@@ -71,8 +71,6 @@ class ProfileWorkerStore(SQLBaseStore): desc="get_from_remote_profile_cache", ) - -class ProfileStore(ProfileWorkerStore): def create_profile(self, user_localpart): return self._simple_insert( table="profiles", @@ -96,6 +94,8 @@ class ProfileStore(ProfileWorkerStore): desc="set_profile_avatar_url", ) + +class ProfileStore(ProfileWorkerStore): def add_remote_profile_cache(self, user_id, displayname, avatar_url): """Ensure we are caching the remote user's profiles.