From 2f5ad16230edd47f5a18026e63d002cd388178e6 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Thu, 12 Aug 2021 16:44:55 -0400 Subject: [PATCH 1/3] Mention that a canonical alias event should be created if alias specified --- data/api/client-server/create_room.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml index fc558c03..a3cb1176 100644 --- a/data/api/client-server/create_room.yaml +++ b/data/api/client-server/create_room.yaml @@ -48,16 +48,19 @@ paths: (and not other members) permission to send state events. Overridden by the `power_level_content_override` parameter. - 4. Events set by the `preset`. Currently these are the `m.room.join_rules`, + 4. An `m.room.canonical_alias` event if `room_alias_name` is given and + no `m.room.canonical_alias` event is given in `initial_state`. + + 5. Events set by the `preset`. Currently these are the `m.room.join_rules`, `m.room.history_visibility`, and `m.room.guest_access` state events. - 5. Events listed in `initial_state`, in the order that they are + 6. Events listed in `initial_state`, in the order that they are listed. - 6. Events implied by `name` and `topic` (`m.room.name` and `m.room.topic` + 7. Events implied by `name` and `topic` (`m.room.name` and `m.room.topic` state events). - 7. Invite events implied by `invite` and `invite_3pid` (`m.room.member` with + 8. Invite events implied by `invite` and `invite_3pid` (`m.room.member` with `membership: invite` and `m.room.third_party_invite`). The available presets do the following with respect to room state: @@ -112,7 +115,8 @@ paths: would be `#foo:example.com`. The complete room alias will become the canonical alias for - the room. + the room and an `m.room.canonical_alias` event will be sent + into the room. name: type: string description: |- From 5a3d5a5decfda986b2f531eeef6fbebd97c47921 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Thu, 12 Aug 2021 17:18:45 -0400 Subject: [PATCH 2/3] add changelog --- changelogs/client_server/newsfragments/3337.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/3337.clarification diff --git a/changelogs/client_server/newsfragments/3337.clarification b/changelogs/client_server/newsfragments/3337.clarification new file mode 100644 index 00000000..9f8eb2f2 --- /dev/null +++ b/changelogs/client_server/newsfragments/3337.clarification @@ -0,0 +1 @@ +Mention that a canonical alias event should be added when a room is created with an alias. \ No newline at end of file From d0a6c5b2b3a3d9dfeb19eaa8557759b541199538 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 13 Aug 2021 12:43:33 -0400 Subject: [PATCH 3/3] drop initial state check --- data/api/client-server/create_room.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml index a3cb1176..2a120f2c 100644 --- a/data/api/client-server/create_room.yaml +++ b/data/api/client-server/create_room.yaml @@ -48,8 +48,7 @@ paths: (and not other members) permission to send state events. Overridden by the `power_level_content_override` parameter. - 4. An `m.room.canonical_alias` event if `room_alias_name` is given and - no `m.room.canonical_alias` event is given in `initial_state`. + 4. An `m.room.canonical_alias` event if `room_alias_name` is given. 5. Events set by the `preset`. Currently these are the `m.room.join_rules`, `m.room.history_visibility`, and `m.room.guest_access` state events.