From 806d6fcc243f8b22f31dbb7fe0a80eece1451d6e Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Wed, 21 Jul 2021 08:12:39 -0400 Subject: [PATCH 1/4] Add proposal for room version 8. --- proposals/3289-rooms-v8.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 proposals/3289-rooms-v8.md diff --git a/proposals/3289-rooms-v8.md b/proposals/3289-rooms-v8.md new file mode 100644 index 00000000000..e766e1e045a --- /dev/null +++ b/proposals/3289-rooms-v8.md @@ -0,0 +1,15 @@ +# MSC3289: Room Version 8 + +A new room version, `8`, is proposed using [room version 7](https://spec.matrix.org/unstable/rooms/v7/) +as a base and incorporating the following MSCs: + +* [MSC3083](https://github.com/matrix-org/matrix-doc/pull/3083) - Restricting room + membership based on membership in other rooms + +Though other MSCs are capable of being included in this version, they do not have +sufficient implementation to be considered for this room version. A future room +version may include them. + +Room version `8` upon being added to the specification shall be considered stable. +No other room versions are affected by this MSC. Before room version `8` can enter +the specification, MSC3083 needs complete its final comment period. From 2a92acc59da1306c49e31d3c2ee97c57cb188a9d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 21 Jul 2021 13:42:24 +0100 Subject: [PATCH 2/4] Update 3289-rooms-v8.md --- proposals/3289-rooms-v8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/3289-rooms-v8.md b/proposals/3289-rooms-v8.md index e766e1e045a..7212e0a8cc3 100644 --- a/proposals/3289-rooms-v8.md +++ b/proposals/3289-rooms-v8.md @@ -12,4 +12,4 @@ version may include them. Room version `8` upon being added to the specification shall be considered stable. No other room versions are affected by this MSC. Before room version `8` can enter -the specification, MSC3083 needs complete its final comment period. +the specification, MSC3083 needs to complete its final comment period. From 203c107e9e689b7b7812846f78f4712b9ca22539 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 27 Jul 2021 09:40:05 -0400 Subject: [PATCH 3/4] Update redaction rules. --- proposals/3289-rooms-v8.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proposals/3289-rooms-v8.md b/proposals/3289-rooms-v8.md index 7212e0a8cc3..1589da0806d 100644 --- a/proposals/3289-rooms-v8.md +++ b/proposals/3289-rooms-v8.md @@ -13,3 +13,10 @@ version may include them. Room version `8` upon being added to the specification shall be considered stable. No other room versions are affected by this MSC. Before room version `8` can enter the specification, MSC3083 needs to complete its final comment period. + +## Updated redaction rules + +Room version 8 shall update the redaction rules for the `m.room.join_rules` event. +[Room version 1](https://spec.matrix.org/unstable/rooms/v1/#redactions) defines +that only the `join_rule` key in the content object should be kept. Room version +8 defines that both the `join_rule` and `allow` keys of the content shall be kept. From 0a016466c61856b8c402e3792ccf8cad55afc99f Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 27 Jul 2021 12:28:20 -0400 Subject: [PATCH 4/4] Revert "Update redaction rules." This reverts commit 203c107e9e689b7b7812846f78f4712b9ca22539. --- proposals/3289-rooms-v8.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/proposals/3289-rooms-v8.md b/proposals/3289-rooms-v8.md index 1589da0806d..7212e0a8cc3 100644 --- a/proposals/3289-rooms-v8.md +++ b/proposals/3289-rooms-v8.md @@ -13,10 +13,3 @@ version may include them. Room version `8` upon being added to the specification shall be considered stable. No other room versions are affected by this MSC. Before room version `8` can enter the specification, MSC3083 needs to complete its final comment period. - -## Updated redaction rules - -Room version 8 shall update the redaction rules for the `m.room.join_rules` event. -[Room version 1](https://spec.matrix.org/unstable/rooms/v1/#redactions) defines -that only the `join_rule` key in the content object should be kept. Room version -8 defines that both the `join_rule` and `allow` keys of the content shall be kept.