From fee65dbacb45817873d2e37cad23e5b422c6e0b5 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 27 Jul 2017 17:43:49 +0100 Subject: [PATCH 1/2] Fix response format and 404 example for room alias lookup --- api/client-server/directory.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/client-server/directory.yaml b/api/client-server/directory.yaml index 7a2a2378..0a69a8ec 100644 --- a/api/client-server/directory.yaml +++ b/api/client-server/directory.yaml @@ -98,10 +98,10 @@ paths: description: The room ID for this room alias. servers: type: array - description: A list of servers that are aware of this room ID. + description: A list of servers that are aware of this room alias. items: type: string - description: A server which is aware of this room ID. + description: A server which is aware of this room alias. examples: application/json: |- { @@ -118,7 +118,7 @@ paths: application/json: |- { "errcode": "M_NOT_FOUND", - "error": "Room ID !abnjk1jdasj98:capuchins.com not found." + "error": "Room alias #monkeys:matrix.org not found." } tags: - Room directory From 25f23873d47b4fd2d09fd6f0ddc0df093c78333f Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 27 Jul 2017 17:45:14 +0100 Subject: [PATCH 2/2] Update changelog --- changelogs/client_server.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst index dfa77674..b5f31209 100644 --- a/changelogs/client_server.rst +++ b/changelogs/client_server.rst @@ -51,7 +51,9 @@ - Spec clarifications: - - Fixed examples of ``m.room.member`` event and room state change, + - Fix response format and 404 example for room alias lookup + (`#960 `) + - Fix examples of ``m.room.member`` event and room state change, and added a clarification on the membership event sent upon profile update (`#950 `_). - Spell out the way that state is handled by ``POST /createRoom``