From 2370a4c970809bcd7da5391b53ef98b062cffd84 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 18 Jul 2016 12:57:41 +0100
Subject: [PATCH] Spell out the state algorithm for createRoom

Fixes https://matrix.org/jira/browse/SPEC-429.

Synapse currently follows the specified ordering, but does *not* give the
specified error when the state is invalid (instead it creates the room anyway
but gives a 403 M_FORBIDDEN). Still, I don't think that should be a real
problem for any real clients, and nothing would break if we changed this in
synapse, so it might as well go in the spec anyway.
---
 api/client-server/create_room.yaml  | 35 ++++++++++++++++++++++++++---
 changelogs/client_server.rst        |  7 ++++--
 specification/client_server_api.rst |  5 ++++-
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/api/client-server/create_room.yaml b/api/client-server/create_room.yaml
index cf4e2a48..9107e185 100644
--- a/api/client-server/create_room.yaml
+++ b/api/client-server/create_room.yaml
@@ -32,6 +32,20 @@ paths:
       summary: Create a new room
       description: |-
         Create a new room with various configuration options.
+
+        The server MUST apply the normal state resolution rules when creating
+        the new room, including checking power levels for each event. It MUST
+        apply the events implied by the request in the following order:
+
+        1. Events set by ``presets``.
+
+        2. Events listed in ``initial_state``, in the order that they are
+           listed.
+
+        3. Events implied by ``name`` and ``topic``.
+
+        4. Invite events implied by ``invite`` and ``invite_3pid``.
+
       security:
         - accessToken: []
       parameters:
@@ -114,7 +128,7 @@ paths:
                 type: object
                 description: |-
                   Extra keys to be added to the content of the ``m.room.create``.
-                  The server will clober the following keys: ``creator``. Future
+                  The server will clobber the following keys: ``creator``. Future
                   versions of the specification may allow the server to clobber
                   other keys.
               initial_state:
@@ -124,6 +138,7 @@ paths:
                   the user to override the default state events set in the new
                   room. The expected format of the state events are an object
                   with type, state_key and content keys set.
+
                   Takes precedence over events set by ``presets``, but gets
                   overriden by ``name`` and ``topic`` keys.
                 items:
@@ -173,7 +188,21 @@ paths:
                 "room_id": "!sefiuhWgwghwWgh:example.com"
               }
         400:
-          description: >
-            The request body is malformed or the room alias specified is already taken.
+          description: |-
+
+            The request is invalid. A meaningful ``errcode`` and description
+            error text will be returned. Example reasons for rejection include:
+
+            - The request body is malformed (``errcode`` set to ``M_BAD_JSON``
+              or ``M_NOT_JSON``).
+
+            - The room alias specified is already taken (``errcode`` set to
+              ``M_ROOM_IN_USE``).
+
+            - The initial state implied by the parameters to the request is
+              invalid: for example, the user's ``power_level`` is set below
+              that necessary to set the room name (``errcode`` set to
+              ``M_INVALID_ROOM_STATE``).
+
       tags:
         - Room creation
diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 1f5fbcd1..6fcebbbf 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,12 +1,15 @@
 <Unreleased changes>
 ====================
 
-Nothing yet!
+- Spec clarifications:
+
+  - Spell out the way that state is handled by ``POST /createRoom``
+    (`#362 <https://github.com/matrix-org/matrix-doc/pull/362>`_).
 
 r0.2.0
 ======
 
-- Spec clarifications
+- Spec clarifications:
 
   - Room aliases (`#337 <https://github.com/matrix-org/matrix-doc/pull/337>`_):
 
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index e0b1d657..23cbbf3a 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -123,7 +123,10 @@ Some requests have unique error codes:
   Encountered when trying to register a user ID which is not valid.
 
 :``M_ROOM_IN_USE``:
-  Encountered when trying to create a room which has been taken.
+  Sent when the room alias given to the ``createRoom`` API is already in use.
+
+:``M_INVALID_ROOM_STATE``:
+  Sent when the intial state given to the ``createRoom`` API is invalid.
 
 :``M_BAD_PAGINATION``:
   Encountered when specifying bad pagination query parameters.