diff options
| author | Erik Johnston <erik@matrix.org> | 2023-12-04 14:12:08 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2023-12-04 14:12:08 +0000 |
| commit | 85151a345d81da13570492c76a0c3da1594ddf54 (patch) | |
| tree | b685ce8d86e60990b423a088130263feaddae35e /synapse/config | |
| parent | Try using uvloop with asyncio (diff) | |
| parent | Switch UNIX socket paths to /run, and add a UNIX socket example for HAProxy (... (diff) | |
| download | synapse-85151a345d81da13570492c76a0c3da1594ddf54.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/py312_asyncio github/erikj/py312_asyncio erikj/py312_asyncio
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/experimental.py | 4 | ||||
| -rw-r--r-- | synapse/config/server_notices.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py index 9f830e7094..6b9febe5a7 100644 --- a/synapse/config/experimental.py +++ b/synapse/config/experimental.py @@ -419,3 +419,7 @@ class ExperimentalConfig(Config): self.msc4028_push_encrypted_events = experimental.get( "msc4028_push_encrypted_events", False ) + + self.msc4069_profile_inhibit_propagation = experimental.get( + "msc4069_profile_inhibit_propagation", False + ) diff --git a/synapse/config/server_notices.py b/synapse/config/server_notices.py index ce041abe9b..a8badba0f8 100644 --- a/synapse/config/server_notices.py +++ b/synapse/config/server_notices.py @@ -48,6 +48,7 @@ class ServerNoticesConfig(Config): self.server_notices_mxid_display_name: Optional[str] = None self.server_notices_mxid_avatar_url: Optional[str] = None self.server_notices_room_name: Optional[str] = None + self.server_notices_auto_join: bool = False def read_config(self, config: JsonDict, **kwargs: Any) -> None: c = config.get("server_notices") @@ -62,3 +63,4 @@ class ServerNoticesConfig(Config): self.server_notices_mxid_avatar_url = c.get("system_mxid_avatar_url", None) # todo: i18n self.server_notices_room_name = c.get("room_name", "Server Notices") + self.server_notices_auto_join = c.get("auto_join", False) |