Use room version 9 as the default room version (per MSC3589). (#12058)

clokep · web-flow · commit 7bcc28f82fe1 · 2022-02-22T14:09:40.000Z
diff --git a/changelog.d/12058.feature b/changelog.d/12058.feature
@@ -0,0 +1 @@
+Use room version 9 as the default room version (per [MSC3589](https://github.com/matrix-org/matrix-doc/pull/3589)).
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -163,7 +163,7 @@ presence:
 # For example, for room version 1, default_room_version should be set
 # to "1".
 #
-#default_room_version: "6"
+#default_room_version: "9"
 
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
 #
diff --git a/synapse/config/server.py b/synapse/config/server.py
@@ -146,7 +146,7 @@ def generate_ip_set(
     "fec0::/10",
 ]
 
-DEFAULT_ROOM_VERSION = "6"
+DEFAULT_ROOM_VERSION = "9"
 
 ROOM_COMPLEXITY_TOO_GREAT = (
     "Your homeserver is unable to join rooms this large or complex. "

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Use room version 9 as the default room version (per [MSC3589](https://github.com/matrix-org/matrix-doc/pull/3589)).`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ presence:`
`163`	`163`	`# For example, for room version 1, default_room_version should be set`
`164`	`164`	`# to "1".`
`165`	`165`	`#`
`166`		`-#default_room_version: "6"`
	`166`	`+#default_room_version: "9"`
`167`	`167`
`168`	`168`	# The GC threshold parameters to pass to `gc.set_threshold`, if defined
`169`	`169`	`#`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ def generate_ip_set(`
`146`	`146`	`"fec0::/10",`
`147`	`147`	`]`
`148`	`148`
`149`		`-DEFAULT_ROOM_VERSION = "6"`
	`149`	`+DEFAULT_ROOM_VERSION = "9"`
`150`	`150`
`151`	`151`	`ROOM_COMPLEXITY_TOO_GREAT = (`
`152`	`152`	`"Your homeserver is unable to join rooms this large or complex. "`