From b0f873785d338922876990d30e542079888b11d8 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 21 Aug 2019 18:03:17 -0600 Subject: [PATCH 1/4] Proposal for room version 6 --- proposals/2240-rooms-v6.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 proposals/2240-rooms-v6.md diff --git a/proposals/2240-rooms-v6.md b/proposals/2240-rooms-v6.md new file mode 100644 index 000000000..a67a1ad75 --- /dev/null +++ b/proposals/2240-rooms-v6.md @@ -0,0 +1,21 @@ +# MSC2240: Room Version 6 + +A new room version, `6`, is proposed using [room version 5](https://matrix.org/docs/spec/rooms/v5.html) +as a starting point and incorporating the following MSCs: + +* [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Moving the `redacts` key. +* [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Removing the `creator` from create events. +* [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) - Modern redaction rules. +* [MSC2209](https://github.com/matrix-org/matrix-doc/pull/2209) - Including notifications in power level auth rules. +* [MSC2212](https://github.com/matrix-org/matrix-doc/pull/2212) - Third party user power levels. +* [MSC2213](https://github.com/matrix-org/matrix-doc/pull/2213) - Rejoinability of invite-only rooms. +* [MSC1849](https://github.com/matrix-org/matrix-doc/pull/1849) - Event aggregations/relationships. + +MSCs which require a new room version and are excluded from v6 are: +* [MSC2214](https://github.com/matrix-org/matrix-doc/pull/2214) - Joining upgraded private rooms. + This MSC is excluded due to the solution not being fully worked out. As this v6 proposal progresses, + it is possible for it to be included in the future. + + +Room version 6 upon being added to the specification shall be considered stable. No other room versions +are affected by this MSC. From f156938821cba90bb555af45dac28c01b460524f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 12 May 2020 16:10:14 -0600 Subject: [PATCH 2/4] Update v6 room proposal for modern activity --- proposals/2240-rooms-v6.md | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/proposals/2240-rooms-v6.md b/proposals/2240-rooms-v6.md index a67a1ad75..fddbdc9c5 100644 --- a/proposals/2240-rooms-v6.md +++ b/proposals/2240-rooms-v6.md @@ -1,21 +1,14 @@ # MSC2240: Room Version 6 -A new room version, `6`, is proposed using [room version 5](https://matrix.org/docs/spec/rooms/v5.html) -as a starting point and incorporating the following MSCs: +A new room version, `6`, is proposed using [room version 5](https://matrix.org/docs/spec/rooms/v5.html) as a base +and incorporating the following MSCs: -* [MSC2174](https://github.com/matrix-org/matrix-doc/pull/2174) - Moving the `redacts` key. -* [MSC2175](https://github.com/matrix-org/matrix-doc/pull/2175) - Removing the `creator` from create events. -* [MSC2176](https://github.com/matrix-org/matrix-doc/pull/2176) - Modern redaction rules. * [MSC2209](https://github.com/matrix-org/matrix-doc/pull/2209) - Including notifications in power level auth rules. -* [MSC2212](https://github.com/matrix-org/matrix-doc/pull/2212) - Third party user power levels. -* [MSC2213](https://github.com/matrix-org/matrix-doc/pull/2213) - Rejoinability of invite-only rooms. -* [MSC1849](https://github.com/matrix-org/matrix-doc/pull/1849) - Event aggregations/relationships. +* [MSC2212](https://github.com/matrix-org/matrix-doc/pull/2432) - Alias event authorisation and redaction. +* PLACEHOLDER - Something to do with integers. -MSCs which require a new room version and are excluded from v6 are: -* [MSC2214](https://github.com/matrix-org/matrix-doc/pull/2214) - Joining upgraded private rooms. - This MSC is excluded due to the solution not being fully worked out. As this v6 proposal progresses, - it is possible for it to be included in the future. +Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be +considered stable enough for v6 rooms. A future room version may still include them. - -Room version 6 upon being added to the specification shall be considered stable. No other room versions -are affected by this MSC. +Room version 6 upon being added to the specification shall be considered stable. No other room versions are affected +by this MSC. From d8e6e17bd378481e7f411f83c1fe30b001b9fb18 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 13 May 2020 09:42:14 -0600 Subject: [PATCH 3/4] Incorporate integers MSC --- proposals/2240-rooms-v6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/2240-rooms-v6.md b/proposals/2240-rooms-v6.md index fddbdc9c5..9555f97c6 100644 --- a/proposals/2240-rooms-v6.md +++ b/proposals/2240-rooms-v6.md @@ -5,7 +5,7 @@ and incorporating the following MSCs: * [MSC2209](https://github.com/matrix-org/matrix-doc/pull/2209) - Including notifications in power level auth rules. * [MSC2212](https://github.com/matrix-org/matrix-doc/pull/2432) - Alias event authorisation and redaction. -* PLACEHOLDER - Something to do with integers. +* [MSC2540](https://github.com/matrix-org/matrix-doc/pull/2540) - Integers in canonical JSON compliance. Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be considered stable enough for v6 rooms. A future room version may still include them. From 560eb6df71d974f71038c67f004092e9beca3076 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 14 May 2020 10:44:44 -0600 Subject: [PATCH 4/4] Fix MSC reference --- proposals/2240-rooms-v6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/2240-rooms-v6.md b/proposals/2240-rooms-v6.md index 9555f97c6..2b3f1163b 100644 --- a/proposals/2240-rooms-v6.md +++ b/proposals/2240-rooms-v6.md @@ -4,7 +4,7 @@ A new room version, `6`, is proposed using [room version 5](https://matrix.org/d and incorporating the following MSCs: * [MSC2209](https://github.com/matrix-org/matrix-doc/pull/2209) - Including notifications in power level auth rules. -* [MSC2212](https://github.com/matrix-org/matrix-doc/pull/2432) - Alias event authorisation and redaction. +* [MSC2432](https://github.com/matrix-org/matrix-doc/pull/2432) - Alias event authorisation and redaction. * [MSC2540](https://github.com/matrix-org/matrix-doc/pull/2540) - Integers in canonical JSON compliance. Though other MSCs are capable of being included in this version, they do not have sufficient implementation to be