diff options
| author | lugino-emeritus <lugino-emeritus@users.noreply.github.com> | 2020-07-28 14:41:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 13:41:44 +0100 |
| commit | 3857de2194e3b2057c4af71e095eb6759508f25f (patch) | |
| tree | 3acf01753d0132a93955218e37c87d259bd9a59c /synapse/config | |
| parent | Merge tag 'v1.18.0rc2' into develop (diff) | |
| download | synapse-3857de2194e3b2057c4af71e095eb6759508f25f.tar.xz | |
Option to allow server admins to join complex rooms (#7902)
Fixes #7901. Signed-off-by: Niklas Tittjung <nik_t.01@web.de>
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 3747a01ca7..848587d232 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -439,6 +439,9 @@ class ServerConfig(Config): validator=attr.validators.instance_of(str), default=ROOM_COMPLEXITY_TOO_GREAT, ) + admins_can_join = attr.ib( + validator=attr.validators.instance_of(bool), default=False + ) self.limit_remote_rooms = LimitRemoteRoomsConfig( **(config.get("limit_remote_rooms") or {}) @@ -893,6 +896,10 @@ class ServerConfig(Config): # #complexity_error: "This room is too complex." + # allow server admins to join complex rooms. Default is false. + # + #admins_can_join: true + # Whether to require a user to be in the room to add an alias to it. # Defaults to 'true'. # |