From 68f46e07f2bab943051f46c03912946ade2edea9 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 15 May 2020 15:14:33 +0100 Subject: Fix sytest CI * Switch sytest-synapse to sytest-dinsic * Be sure to invalidate our caches properly! * Remove duplicate encryption state key definition * Remove old config option name in comment * Make dinsic the default in merge_base_branch --- synapse/api/constants.py | 1 - synapse/handlers/profile.py | 2 +- synapse/handlers/room.py | 2 +- synapse/storage/data_stores/main/profile.py | 6 ++++++ 4 files changed, 8 insertions(+), 3 deletions(-) (limited to 'synapse') diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 42eff8793b..cc8577552b 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -85,7 +85,6 @@ class EventTypes(object): RoomAvatar = "m.room.avatar" RoomEncryption = "m.room.encryption" GuestAccess = "m.room.guest_access" - Encryption = "m.room.encryption" # These are used for validation Message = "m.room.message" diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 824fadf028..e800504ea6 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -493,7 +493,7 @@ class BaseProfileHandler(BaseHandler): @defer.inlineCallbacks def check_profile_query_allowed(self, target_user, requester=None): """Checks whether a profile query is allowed. If the - 'limit_profile_requests_to_known_users' config flag is set to True and a + 'require_auth_for_profile_requests' config flag is set to True and a 'requester' is provided, the query is only allowed if the two users share a room. diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index b13a2b94b6..ee9fc296e1 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -875,7 +875,7 @@ class RoomCreationHandler(BaseHandler): if "encryption_alg" in config: yield send( - etype=EventTypes.Encryption, + etype=EventTypes.RoomEncryption, state_key="", content={"algorithm": config["encryption_alg"]}, ) diff --git a/synapse/storage/data_stores/main/profile.py b/synapse/storage/data_stores/main/profile.py index f438dd38be..2a97991d23 100644 --- a/synapse/storage/data_stores/main/profile.py +++ b/synapse/storage/data_stores/main/profile.py @@ -126,6 +126,9 @@ class ProfileWorkerStore(SQLBaseStore): ) def set_profile_displayname(self, user_localpart, new_displayname, batchnum): + # Invalidate the read cache for this user + self.get_profile_displayname.invalidate((user_localpart,)) + return self.db.simple_upsert( table="profiles", keyvalues={"user_id": user_localpart}, @@ -135,6 +138,9 @@ class ProfileWorkerStore(SQLBaseStore): ) def set_profile_avatar_url(self, user_localpart, new_avatar_url, batchnum): + # Invalidate the read cache for this user + self.get_profile_avatar_url.invalidate((user_localpart,)) + return self.db.simple_upsert( table="profiles", keyvalues={"user_id": user_localpart}, -- cgit 1.5.1