From 954dc48f576b96966a195bce2a7851f951fda18d Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 13 Apr 2021 15:20:51 -0400 Subject: [PATCH 1/2] Use the same domain for room ID and avatar URL. --- data/api/client-server/definitions/public_rooms_response.yaml | 2 +- data/api/server-server/public_rooms.yaml | 2 +- proposals/2403-knock.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/api/client-server/definitions/public_rooms_response.yaml b/data/api/client-server/definitions/public_rooms_response.yaml index ab701051..04680246 100644 --- a/data/api/client-server/definitions/public_rooms_response.yaml +++ b/data/api/client-server/definitions/public_rooms_response.yaml @@ -90,7 +90,7 @@ example: { "chunk": [ { "aliases": ["#murrays:cheese.bar"], - "avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", + "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE", "guest_can_join": false, "name": "CHEESE", "num_joined_members": 37, diff --git a/data/api/server-server/public_rooms.yaml b/data/api/server-server/public_rooms.yaml index 3c8d7ea6..e52f6d48 100644 --- a/data/api/server-server/public_rooms.yaml +++ b/data/api/server-server/public_rooms.yaml @@ -215,7 +215,7 @@ paths: "chunk": [ { "aliases": ["#murrays:cheese.bar"], - "avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", + "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE", "guest_can_join": false, "name": "CHEESE", "num_joined_members": 37, diff --git a/proposals/2403-knock.md b/proposals/2403-knock.md index 8bad1766..c0f39254 100644 --- a/proposals/2403-knock.md +++ b/proposals/2403-knock.md @@ -199,7 +199,7 @@ contain this information: "aliases": [ "#murrays:cheese.bar" ], - "avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", + "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE", "guest_can_join": false, "name": "CHEESE", "num_joined_members": 37, From bd2db9ff85faf51327833ae26dd460f7d5a44f33 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 13 Apr 2021 18:52:56 -0600 Subject: [PATCH 2/2] Add changelogs --- changelogs/client_server/newsfragments/3116.clarification | 1 + changelogs/server_server/newsfragments/3116.clarification | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelogs/client_server/newsfragments/3116.clarification create mode 100644 changelogs/server_server/newsfragments/3116.clarification diff --git a/changelogs/client_server/newsfragments/3116.clarification b/changelogs/client_server/newsfragments/3116.clarification new file mode 100644 index 00000000..3ccb2333 --- /dev/null +++ b/changelogs/client_server/newsfragments/3116.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification. diff --git a/changelogs/server_server/newsfragments/3116.clarification b/changelogs/server_server/newsfragments/3116.clarification new file mode 100644 index 00000000..3ccb2333 --- /dev/null +++ b/changelogs/server_server/newsfragments/3116.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification.