diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-05-15 15:14:33 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-05-28 13:56:07 +0100 |
| commit | 68f46e07f2bab943051f46c03912946ade2edea9 (patch) | |
| tree | 3abfb476ccb1ccf67d86df1713c3fe62c3eac909 /synapse/handlers | |
| parent | Add ProfileStore to synapse_port_db as it has a dinsic background update (diff) | |
| download | synapse-68f46e07f2bab943051f46c03912946ade2edea9.tar.xz | |
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
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/profile.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 2 |
2 files changed, 2 insertions, 2 deletions
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"]}, ) |