Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-23 11:34:09 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #960 from matrix-org/babolivier/fix-get-room-alias

Browse source 
Fix response format and 404 example for room alias lookup
This commit is contained in:
Richard van der Hoff 2017-08-02 14:20:17 +01:00 committed by GitHub
parent 4a4ca9e39b 25f23873d4
commit b8ac9fdefa
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/client-server/directory.yaml
View file

@ -98,10 +98,10 @@ paths:
description: The room ID for this room alias. description: The room ID for this room alias.
servers: servers:
type: array 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: items:
type: string type: string
description: A server which is aware of this room ID. description: A server which is aware of this room alias.
examples: examples:
application/json: |- application/json: |-
{ {
@ -118,7 +118,7 @@ paths:
application/json: |- application/json: |-
{ {
"errcode": "M_NOT_FOUND", "errcode": "M_NOT_FOUND",
"error": "Room ID !abnjk1jdasj98:capuchins.com not found." "error": "Room alias #monkeys:matrix.org not found."
} }
tags: tags:
- Room directory - Room directory

4
changelogs/client_server.rst
View file

@ -51,7 +51,9 @@
- Spec clarifications: - Spec clarifications:
- Fixed examples of ``m.room.member`` event and room state change, - Fix response format and 404 example for room alias lookup
(`#960 <https://github.com/matrix-org/matrix-doc/pull/960>`)
- Fix examples of ``m.room.member`` event and room state change,
and added a clarification on the membership event sent upon profile update and added a clarification on the membership event sent upon profile update
(`#950 <https://github.com/matrix-org/matrix-doc/pull/950>`_). (`#950 <https://github.com/matrix-org/matrix-doc/pull/950>`_).
- Spell out the way that state is handled by ``POST /createRoom`` - Spell out the way that state is handled by ``POST /createRoom``