summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-08-20 07:17:50 -0400
committerGitHub <noreply@github.com>2021-08-20 07:17:50 -0400
commit5cda75fedef3dd02d3b456231be0a1b4bff2a31a (patch)
tree7fb4684264150511dc9dc701c08017668ecf3dfd /synapse
parentFix typo in release notes (#10646) (diff)
downloadsynapse-5cda75fedef3dd02d3b456231be0a1b4bff2a31a.tar.xz
Set room version 8 as preferred for restricted rooms. (#10571)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/room_versions.py2
-rw-r--r--synapse/config/experimental.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py
index 11280c4462..8abcdfd4fd 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -293,7 +293,7 @@ MSC3244_CAPABILITIES = {
         ),
         RoomVersionCapability(
             "restricted",
-            None,
+            RoomVersions.V8,
             lambda room_version: room_version.msc3083_join_rules,
         ),
     )
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index b918fb15b0..907df9591a 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -37,7 +37,7 @@ class ExperimentalConfig(Config):
         self.msc2285_enabled: bool = experimental.get("msc2285_enabled", False)
 
         # MSC3244 (room version capabilities)
-        self.msc3244_enabled: bool = experimental.get("msc3244_enabled", False)
+        self.msc3244_enabled: bool = experimental.get("msc3244_enabled", True)
 
         # MSC3266 (room summary api)
         self.msc3266_enabled: bool = experimental.get("msc3266_enabled", False)