summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-03-30 12:12:44 +0100
committerGitHub <noreply@github.com>2021-03-30 12:12:44 +0100
commitf02663c4ddfa259c96aebde848a83156540c9fb3 (patch)
tree00667a26bc8f9cbda98a3ea0f6d6312476489f34 /synapse/handlers
parentMake RateLimiter class check for ratelimit overrides (#9711) (diff)
downloadsynapse-f02663c4ddfa259c96aebde848a83156540c9fb3.tar.xz
Replace `room_invite_state_types` with `room_prejoin_state` (#9700)
`room_invite_state_types` was inconvenient as a configuration setting, because
anyone that ever set it would not receive any new types that were added to the
defaults. Here, we deprecate the old setting, and replace it with a couple of
new settings under `room_prejoin_state`.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 1b7c065b34..6069968f7f 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -385,7 +385,7 @@ class EventCreationHandler:
         self._events_shard_config = self.config.worker.events_shard_config
         self._instance_name = hs.get_instance_name()
 
-        self.room_invite_state_types = self.hs.config.room_invite_state_types
+        self.room_invite_state_types = self.hs.config.api.room_prejoin_state
 
         self.membership_types_to_include_profile_data_in = (
             {Membership.JOIN, Membership.INVITE}