From ae0fb938adf7c333e47720394c0d9f73f9330402 Mon Sep 17 00:00:00 2001 From: Kegsay Date: Mon, 19 Jan 2015 10:45:51 +0000 Subject: [PATCH] Update IRC example to reflect new room ID --- drafts/as-http-api.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drafts/as-http-api.rst b/drafts/as-http-api.rst index 11a404b2..c8aeca35 100644 --- a/drafts/as-http-api.rst +++ b/drafts/as-http-api.rst @@ -154,8 +154,7 @@ Inputs: - Room alias - HS Credentials Output: - - The current state events for the room if any. - - The message events for the room if any. + - Whether the room exists. Side effects: - Room is created on the HS by the AS via CS APIs during the processing of this request. @@ -397,10 +396,10 @@ Pre-conditions: HS -> AS: Room Query "#irc.freenode.net/#matrix:hsdomain.com" GET /rooms/%23irc.freenode.net%2F%23matrix%3Ahsdomain.com?access_token=T_h [Starts blocking] - AS -> HS: Creates room. Gets room ID "!aasaasasa:matrix.org". + AS -> HS: Creates room. Gets room ID "!aasaasasa:hsdomain.com". AS -> HS: Sets room name to "#matrix". AS -> HS: Sends message as ""@irc.freenode.net/Bob:hsdomain.com" - PUT /rooms/%21irc.freenode.net%2F%23matrix%3Ahsdomain.com/send/m.room.message + PUT /rooms/%21aasaasasa%3Ahsdomain.com/send/m.room.message ?access_token=T_a &user_id=%40irc.freenode.net%2FBob%3Ahsdomain.com &ts=1421416883133 @@ -426,7 +425,7 @@ Pre-conditions: 4. @alice:hsdomain.com says "hi!" in this room: :: - User -> HS: Send message "hi!" in room !irc.freenode.net/#matrix:hsdomain.com + User -> HS: Send message "hi!" in room !aasaasasa:hsdomain.com - HS sends message. - HS sees the room ID is in the AS namespace and pushes it to the AS. @@ -442,7 +441,7 @@ Pre-conditions: }, origin_server_ts: , user_id: "@alice:hsdomain.com", - room_id: "!irc.freenode.net/#matrix:hsdomain.com", + room_id: "!aasaasasa:hsdomain.com", type: "m.room.message" } ] @@ -456,7 +455,7 @@ Pre-conditions: IRC -> AS: "what's up?" AS -> HS: Send message via CS API extension - PUT /rooms/%21irc.freenode.net%2F%23matrix%3Ahsdomain.com/send/m.room.message + PUT /rooms/%21aasaasasa%3Ahsdomain.com/send/m.room.message ?access_token=T_a &user_id=%40irc.freenode.net%2FBob%3Ahsdomain.com &ts=1421418084816