From dd8e98851c90723e9a36f61b8459d51b64dc6d5b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 29 Dec 2021 12:03:12 -0700 Subject: [PATCH 1/6] WIP: Template out v10 --- proposals/3604-rooms-v10.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 proposals/3604-rooms-v10.md diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md new file mode 100644 index 0000000000..726bd98568 --- /dev/null +++ b/proposals/3604-rooms-v10.md @@ -0,0 +1,24 @@ +# MSC3604: Room Version 10 + +A new room version, `10`, is proposed using [room version 9](TBD) as a base +and incorporating the following MSCs: + +* [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) - Update to redaction rules + +**TODO: Remove MSCs with no likelihood from below** + +* [MSC2244](https://github.com/matrix-org/matrix-doc/pull/2244) - Mass redactions +* [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Move `redacts` to sane place +* [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Remove extraneous `creator` field +* [MSC2828](https://github.com/matrix-org/matrix-doc/pull/2828) - Restrict allowed user IDs over federation +* [MSC1229](https://github.com/matrix-org/matrix-doc/issues/1229) - Mitigating abuse of `depth` + +Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be +considered stable enough for v10 rooms. A future room version may still include them. + +Room version 10 upon being added to the specification shall be considered stable. No other room versions are affected +by this MSC. + +## Unstable prefix + +Implementation is strongly not suggested at this stage. From 4f1545c08adf779450284fb8dc4f6663308958d0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 29 Dec 2021 13:01:24 -0700 Subject: [PATCH 2/6] Add opt1 room version prefix --- proposals/3604-rooms-v10.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md index 726bd98568..050236fa44 100644 --- a/proposals/3604-rooms-v10.md +++ b/proposals/3604-rooms-v10.md @@ -22,3 +22,6 @@ by this MSC. ## Unstable prefix Implementation is strongly not suggested at this stage. + +Prefixes in the wild: +* `org.matrix.msc3604.opt1`: `v9` + MSC2176 (https://github.com/matrix-org/synapse/pull/11662) From 997ad9e083803a81657429013ba898dc36a9a387 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 24 Jan 2022 14:08:06 -0700 Subject: [PATCH 3/6] Update 3604-rooms-v10.md --- proposals/3604-rooms-v10.md | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md index 050236fa44..4ea08424fe 100644 --- a/proposals/3604-rooms-v10.md +++ b/proposals/3604-rooms-v10.md @@ -7,6 +7,7 @@ and incorporating the following MSCs: **TODO: Remove MSCs with no likelihood from below** +* [MSC3667](https://github.com/matrix-org/matrix-doc/pull/3667) - Enforcing integer parsing on power levels * [MSC2244](https://github.com/matrix-org/matrix-doc/pull/2244) - Mass redactions * [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Move `redacts` to sane place * [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Remove extraneous `creator` field From d6c520d2b59c22231dbe3ece9c4fa232564de25d Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 1 Feb 2022 20:35:10 -0700 Subject: [PATCH 4/6] Upgrade MSC3667 --- proposals/3604-rooms-v10.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md index 4ea08424fe..3e8d9735ee 100644 --- a/proposals/3604-rooms-v10.md +++ b/proposals/3604-rooms-v10.md @@ -4,10 +4,10 @@ A new room version, `10`, is proposed using [room version 9](TBD) as a base and incorporating the following MSCs: * [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) - Update to redaction rules +* [MSC3667](https://github.com/matrix-org/matrix-doc/pull/3667) - Enforcing integer parsing on power levels **TODO: Remove MSCs with no likelihood from below** -* [MSC3667](https://github.com/matrix-org/matrix-doc/pull/3667) - Enforcing integer parsing on power levels * [MSC2244](https://github.com/matrix-org/matrix-doc/pull/2244) - Mass redactions * [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Move `redacts` to sane place * [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Remove extraneous `creator` field @@ -26,3 +26,4 @@ Implementation is strongly not suggested at this stage. Prefixes in the wild: * `org.matrix.msc3604.opt1`: `v9` + MSC2176 (https://github.com/matrix-org/synapse/pull/11662) +* `org.matrix.msc3604.opt2`: `v9` + MSC2176 + MSC3667 (https://github.com/matrix-org/synapse/pull/11885) From 6c69cccae908ce5628cef7493a20e0d1d2b3446c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 3 May 2022 21:09:27 -0600 Subject: [PATCH 5/6] Cut a v10 --- proposals/3604-rooms-v10.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md index 3e8d9735ee..84caf52030 100644 --- a/proposals/3604-rooms-v10.md +++ b/proposals/3604-rooms-v10.md @@ -1,12 +1,15 @@ # MSC3604: Room Version 10 -A new room version, `10`, is proposed using [room version 9](TBD) as a base +A new room version, `10`, is proposed using [room version 9](https://spec.matrix.org/v1.2/rooms/v9/) as a base and incorporating the following MSCs: -* [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) - Update to redaction rules -* [MSC3667](https://github.com/matrix-org/matrix-doc/pull/3667) - Enforcing integer parsing on power levels +* [MSC2176](https://github.com/matrix-org/matrix-spec-proposals/pull/2176) - Update to redaction rules +* [MSC3667](https://github.com/matrix-org/matrix-spec-proposals/pull/3667) - Enforcing integer parsing on power levels +* [MSC3787](https://github.com/matrix-org/matrix-spec-proposals/pull/3787) - Allowing knocks to restricted rooms -**TODO: Remove MSCs with no likelihood from below** +Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be +considered stable enough for v10 rooms. A future room version may still include them. Such examples of ineligible MSCs +are: * [MSC2244](https://github.com/matrix-org/matrix-doc/pull/2244) - Mass redactions * [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Move `redacts` to sane place @@ -14,16 +17,14 @@ and incorporating the following MSCs: * [MSC2828](https://github.com/matrix-org/matrix-doc/pull/2828) - Restrict allowed user IDs over federation * [MSC1229](https://github.com/matrix-org/matrix-doc/issues/1229) - Mitigating abuse of `depth` -Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be -considered stable enough for v10 rooms. A future room version may still include them. - Room version 10 upon being added to the specification shall be considered stable. No other room versions are affected by this MSC. ## Unstable prefix -Implementation is strongly not suggested at this stage. +Implementations looking to test v10 before written into the specification should use `org.matrix.msc3604.opt3` +as the room version, treating it as unstable. -Prefixes in the wild: +Other prefixes in the wild: * `org.matrix.msc3604.opt1`: `v9` + MSC2176 (https://github.com/matrix-org/synapse/pull/11662) * `org.matrix.msc3604.opt2`: `v9` + MSC2176 + MSC3667 (https://github.com/matrix-org/synapse/pull/11885) From d62e95c2768575d29bba93cea9b44d575449e3b5 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 19 May 2022 18:58:59 -0600 Subject: [PATCH 6/6] Move MSC2176 to "not feasible" section --- proposals/3604-rooms-v10.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/3604-rooms-v10.md b/proposals/3604-rooms-v10.md index 84caf52030..e57954e252 100644 --- a/proposals/3604-rooms-v10.md +++ b/proposals/3604-rooms-v10.md @@ -3,7 +3,6 @@ A new room version, `10`, is proposed using [room version 9](https://spec.matrix.org/v1.2/rooms/v9/) as a base and incorporating the following MSCs: -* [MSC2176](https://github.com/matrix-org/matrix-spec-proposals/pull/2176) - Update to redaction rules * [MSC3667](https://github.com/matrix-org/matrix-spec-proposals/pull/3667) - Enforcing integer parsing on power levels * [MSC3787](https://github.com/matrix-org/matrix-spec-proposals/pull/3787) - Allowing knocks to restricted rooms @@ -11,11 +10,12 @@ Though other MSCs are capable of being included in this version, they do not hav considered stable enough for v10 rooms. A future room version may still include them. Such examples of ineligible MSCs are: -* [MSC2244](https://github.com/matrix-org/matrix-doc/pull/2244) - Mass redactions -* [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Move `redacts` to sane place -* [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Remove extraneous `creator` field -* [MSC2828](https://github.com/matrix-org/matrix-doc/pull/2828) - Restrict allowed user IDs over federation -* [MSC1229](https://github.com/matrix-org/matrix-doc/issues/1229) - Mitigating abuse of `depth` +* [MSC2244](https://github.com/matrix-org/matrix-spec-proposals/pull/2244) - Mass redactions +* [MSC2174](https://github.com/matrix-org/matrix-spec-proposals/pull/2174) - Move `redacts` to sane place +* [MSC2176](https://github.com/matrix-org/matrix-spec-proposals/pull/2176) - Update to redaction rules +* [MSC2175](https://github.com/matrix-org/matrix-spec-proposals/pull/2175) - Remove extraneous `creator` field +* [MSC2828](https://github.com/matrix-org/matrix-spec-proposals/pull/2828) - Restrict allowed user IDs over federation +* [MSC1229](https://github.com/matrix-org/matrix-spec-proposals/issues/1229) - Mitigating abuse of `depth` Room version 10 upon being added to the specification shall be considered stable. No other room versions are affected by this MSC.