diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-11-03 12:14:24 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-11-03 12:14:24 +0000 |
| commit | 6e7488ce1166ffb1f70777b4db2e9008f3303a04 (patch) | |
| tree | 4cd62ccc22a7eb9630b875e18e05cf4017f62218 /synapse/storage/profile.py | |
| parent | Merge pull request #4047 from matrix-org/michaelkaye/dinsic_allow_user_direct... (diff) | |
| parent | Merge branch 'release-v0.33.8' (diff) | |
| download | synapse-6e7488ce1166ffb1f70777b4db2e9008f3303a04.tar.xz | |
merge master into dinsic, again...
Diffstat (limited to 'synapse/storage/profile.py')
| -rw-r--r-- | synapse/storage/profile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py index e6848c70a0..10133f0a4a 100644 --- a/synapse/storage/profile.py +++ b/synapse/storage/profile.py @@ -123,8 +123,6 @@ class ProfileWorkerStore(SQLBaseStore): desc="get_from_remote_profile_cache", ) - -class ProfileStore(ProfileWorkerStore): def set_profile_displayname(self, user_localpart, new_displayname, batchnum): return self._simple_upsert( table="profiles", @@ -165,6 +163,8 @@ class ProfileStore(ProfileWorkerStore): lock=False # we can do this because user_id has a unique index ) + +class ProfileStore(ProfileWorkerStore): def add_remote_profile_cache(self, user_id, displayname, avatar_url): """Ensure we are caching the remote user's profiles. |