From 19fca645be51c0ed92e3fc6ba15219cc82b84ced Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 7 Sep 2021 09:11:42 -0400
Subject: [PATCH 1/2] Prefer room v9 for restricted rooms.

---
 synapse/api/room_versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py
index a19be6707a85..61d9c658a93f 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -324,7 +324,7 @@ class RoomVersionCapability:
         ),
         RoomVersionCapability(
             "restricted",
-            RoomVersions.V8,
+            RoomVersions.V9,
             lambda room_version: room_version.msc3083_join_rules,
         ),
     )

From db2264ad49e32451167b1c04fac1dc32d1ce1fad Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 7 Sep 2021 09:14:50 -0400
Subject: [PATCH 2/2] Newsfragment

---
 changelog.d/10772.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/10772.feature

diff --git a/changelog.d/10772.feature b/changelog.d/10772.feature
new file mode 100644
index 000000000000..4a550711f62e
--- /dev/null
+++ b/changelog.d/10772.feature
@@ -0,0 +1 @@
+Prefer [room version 9](https://github.com/matrix-org/matrix-doc/pull/3375) for restricted rooms per the [room version caapabilities](https://github.com/matrix-org/matrix-doc/pull/3244) API.