From aed0bbd712fb254f13e779131900f2acd4fd0f10 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 7 Jun 2022 15:22:35 +0200 Subject: [PATCH 1/4] room_type is not a required parameter in practice In practice servers seem to mirror what the room create event does and leave out the room_type when unset. Signed-off-by: Nicolas Werner --- data/api/client-server/space_hierarchy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/api/client-server/space_hierarchy.yaml b/data/api/client-server/space_hierarchy.yaml index 12640b532..309b99e3e 100644 --- a/data/api/client-server/space_hierarchy.yaml +++ b/data/api/client-server/space_hierarchy.yaml @@ -149,7 +149,7 @@ paths: format: int64 description: The `origin_server_ts` for the event. required: [origin_server_ts] - required: [room_type, children_state] + required: [children_state] next_batch: type: string description: |- From b71fd6d4e61b5cd519a4dcd8c9b405ee90acc839 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 7 Jun 2022 15:30:38 +0200 Subject: [PATCH 2/4] Add changelog Signed-off-by: Nicolas Werner --- changelogs/client_server/newsfragments/1110.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/1110.clarification diff --git a/changelogs/client_server/newsfragments/1110.clarification b/changelogs/client_server/newsfragments/1110.clarification new file mode 100644 index 000000000..3ccb23339 --- /dev/null +++ b/changelogs/client_server/newsfragments/1110.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification. From d60878c6386c2905c4135d09ab42ef0014206544 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 7 Jun 2022 15:37:39 +0200 Subject: [PATCH 3/4] Also make room_type and allowed_room_ids optional in the openapi They are optional according to the text, but the openapi marks them as required instead. Signed-off-by: Nicolas Werner --- changelogs/server_server/newsfragments/1100.clarification | 1 + data/api/server-server/space_hierarchy.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelogs/server_server/newsfragments/1100.clarification diff --git a/changelogs/server_server/newsfragments/1100.clarification b/changelogs/server_server/newsfragments/1100.clarification new file mode 100644 index 000000000..e17a2538c --- /dev/null +++ b/changelogs/server_server/newsfragments/1100.clarification @@ -0,0 +1 @@ +Clarify that state keys starting with `@` are in fact reserved. Regressed from [#3658](https://github.com/matrix-org/matrix-spec-proposals/pull/3658). \ No newline at end of file diff --git a/data/api/server-server/space_hierarchy.yaml b/data/api/server-server/space_hierarchy.yaml index cb30fa0fc..834848c98 100644 --- a/data/api/server-server/space_hierarchy.yaml +++ b/data/api/server-server/space_hierarchy.yaml @@ -158,7 +158,7 @@ paths: format: int64 description: The `origin_server_ts` for the event. required: [origin_server_ts] - required: [room_type, allowed_room_ids, children_state] + required: [children_state] children: type: array description: |- From b09a715aec7740292aaf6b6c7b8b182d187583d5 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 7 Jun 2022 15:40:36 +0200 Subject: [PATCH 4/4] Fix copy and paste error of newsfragment Signed-off-by: Nicolas Werner --- changelogs/server_server/newsfragments/1100.clarification | 1 - changelogs/server_server/newsfragments/1110.clarification | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 changelogs/server_server/newsfragments/1100.clarification create mode 100644 changelogs/server_server/newsfragments/1110.clarification diff --git a/changelogs/server_server/newsfragments/1100.clarification b/changelogs/server_server/newsfragments/1100.clarification deleted file mode 100644 index e17a2538c..000000000 --- a/changelogs/server_server/newsfragments/1100.clarification +++ /dev/null @@ -1 +0,0 @@ -Clarify that state keys starting with `@` are in fact reserved. Regressed from [#3658](https://github.com/matrix-org/matrix-spec-proposals/pull/3658). \ No newline at end of file diff --git a/changelogs/server_server/newsfragments/1110.clarification b/changelogs/server_server/newsfragments/1110.clarification new file mode 100644 index 000000000..3ccb23339 --- /dev/null +++ b/changelogs/server_server/newsfragments/1110.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification.