From 81a8c15735a845e13ed1355756dc801d4e38ded4 Mon Sep 17 00:00:00 2001 From: Paarth Shah Date: Fri, 18 Aug 2023 00:42:21 -0700 Subject: [PATCH 1/4] Clarify that 'via' is required as per MSC1772. --- data/event-schemas/schema/m.space.child.yaml | 4 ++-- data/event-schemas/schema/m.space.parent.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/event-schemas/schema/m.space.child.yaml b/data/event-schemas/schema/m.space.child.yaml index feef0adcd..a2ff3763c 100644 --- a/data/event-schemas/schema/m.space.child.yaml +++ b/data/event-schemas/schema/m.space.child.yaml @@ -9,8 +9,6 @@ properties: type: array description: |- A list of servers to try and join through. See also: [Routing](/appendices/#routing). - - When not present or invalid, the child room is not considered to be part of the space. items: type: string order: @@ -34,6 +32,8 @@ properties: Optional (default `false`) flag to denote whether the child is "suggested" or of interest to members of the space. This is primarily intended as a rendering hint for clients to display the room differently, such as eagerly rendering them in the room list. + required: + - via type: object state_key: description: The child room ID being described. diff --git a/data/event-schemas/schema/m.space.parent.yaml b/data/event-schemas/schema/m.space.parent.yaml index ced24d705..b1864f969 100644 --- a/data/event-schemas/schema/m.space.parent.yaml +++ b/data/event-schemas/schema/m.space.parent.yaml @@ -9,8 +9,6 @@ properties: type: array description: |- A list of servers to try and join through. See also: [Routing](/appendices/#routing). - - When not present or invalid, the room is not considered to be part of the parent space. items: type: string canonical: @@ -20,6 +18,8 @@ properties: When multiple `canonical` parents are found, the lowest parent when ordering by room ID lexicographically by Unicode code-points should be used. + required: + - via type: object state_key: description: The parent room ID. From 185b814987f31583a57cb1561f97a719f1821abe Mon Sep 17 00:00:00 2001 From: Paarth Shah Date: Sat, 19 Aug 2023 17:16:47 -0700 Subject: [PATCH 2/4] Code review: restore explanatory text. --- data/event-schemas/schema/m.space.child.yaml | 2 ++ data/event-schemas/schema/m.space.parent.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/event-schemas/schema/m.space.child.yaml b/data/event-schemas/schema/m.space.child.yaml index a2ff3763c..c73d440fa 100644 --- a/data/event-schemas/schema/m.space.child.yaml +++ b/data/event-schemas/schema/m.space.child.yaml @@ -9,6 +9,8 @@ properties: type: array description: |- A list of servers to try and join through. See also: [Routing](/appendices/#routing). + + When not present or invalid, the child room is not considered to be part of the space. items: type: string order: diff --git a/data/event-schemas/schema/m.space.parent.yaml b/data/event-schemas/schema/m.space.parent.yaml index b1864f969..fb6337898 100644 --- a/data/event-schemas/schema/m.space.parent.yaml +++ b/data/event-schemas/schema/m.space.parent.yaml @@ -9,6 +9,8 @@ properties: type: array description: |- A list of servers to try and join through. See also: [Routing](/appendices/#routing). + + When not present or invalid, the room is not considered to be part of the parent space. items: type: string canonical: From 09395325fb502c8fc75815a2878424e82f2e8720 Mon Sep 17 00:00:00 2001 From: Paarth Shah Date: Sun, 20 Aug 2023 00:17:02 -0700 Subject: [PATCH 3/4] Add newsfragment. --- changelogs/client_server/newsfragments/1618.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/1618.clarification diff --git a/changelogs/client_server/newsfragments/1618.clarification b/changelogs/client_server/newsfragments/1618.clarification new file mode 100644 index 000000000..0f746237e --- /dev/null +++ b/changelogs/client_server/newsfragments/1618.clarification @@ -0,0 +1 @@ +Clarify that `via` property is required for `m.space.parent` and `m.space.child` as per MSC1772. Contributed by @PaarthShah From 0cdd34e6f22659d5e3d27a28f5c3991c015dcec4 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 5 Sep 2023 14:46:20 +0100 Subject: [PATCH 4/4] minor changelog tweak --- changelogs/client_server/newsfragments/1618.clarification | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/client_server/newsfragments/1618.clarification b/changelogs/client_server/newsfragments/1618.clarification index 0f746237e..b8d5169dd 100644 --- a/changelogs/client_server/newsfragments/1618.clarification +++ b/changelogs/client_server/newsfragments/1618.clarification @@ -1 +1 @@ -Clarify that `via` property is required for `m.space.parent` and `m.space.child` as per MSC1772. Contributed by @PaarthShah +Clarify that the `via` property is required for `m.space.parent` and `m.space.child` as per MSC1772. Contributed by @PaarthShah.