From cc3e1f58cc2526aea55d974d0ec89a58a81fba14 Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Sat, 15 Oct 2022 10:42:14 +0200
Subject: [PATCH 1/2] Bump default room version to V9; per matrix spec
 recommendation

---
 src/config/mod.rs          | 4 ++--
 src/service/admin/mod.rs   | 2 +-
 src/service/globals/mod.rs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/config/mod.rs b/src/config/mod.rs
index 645f440d..3c3a764a 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -258,6 +258,6 @@ fn default_turn_ttl() -> u64 {
 }
 
 // I know, it's a great name
-fn default_default_room_version() -> RoomVersionId {
-    RoomVersionId::V6
+pub fn default_default_room_version() -> RoomVersionId {
+    RoomVersionId::V9
 }
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 942df1c3..5766b2f2 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -871,7 +871,7 @@ impl Service {
         let mut content = RoomCreateEventContent::new(conduit_user.clone());
         content.federate = true;
         content.predecessor = None;
-        content.room_version = RoomVersionId::V6;
+        content.room_version = services().globals.default_room_version();
 
         // 1. The room create event
         services().rooms.timeline.build_and_append_pdu(
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index d4c9dad0..b2fadc70 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -172,8 +172,8 @@ impl Service {
             .supported_room_versions()
             .contains(&s.config.default_room_version)
         {
-            error!("Room version in config isn't supported, falling back to Version 6");
-            s.config.default_room_version = RoomVersionId::V6;
+            error!("Room version in config isn't supported, falling back to default version");
+            s.config.default_room_version = crate::config::default_default_room_version();
         };
 
         Ok(s)

From 1e1a144dfa98429ef9f02d16045796b73013830d Mon Sep 17 00:00:00 2001
From: Nyaaori <+@nyaaori.cat>
Date: Sat, 15 Oct 2022 12:16:32 +0200
Subject: [PATCH 2/2] Move room version 10 out of experimental/unstable

---
 src/service/globals/mod.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index b2fadc70..affc0516 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -127,14 +127,10 @@ impl Service {
             RoomVersionId::V7,
             RoomVersionId::V8,
             RoomVersionId::V9,
-        ];
-        // Experimental, partially supported room versions
-        let unstable_room_versions = vec![
-            RoomVersionId::V3,
-            RoomVersionId::V4,
-            RoomVersionId::V5,
             RoomVersionId::V10,
         ];
+        // Experimental, partially supported room versions
+        let unstable_room_versions = vec![RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
 
         let mut s = Self {
             db,