Merge 92084268f1 into 7bcc3ecb81

changelogs/client_server/newsfragments/2158.feature

@@ -1 +0,0 @@
-Add `/_matrix/client/v1/room_summary/{roomIdOrAlias}` and extend `/_matrix/client/v1/rooms/{roomId}/hierarchy` with the new optional properties `allowed_room_ids`, `encryption` and `room_version` as per [MSC3266](https://github.com/matrix-org/matrix-spec-proposals/pull/3266).

data/api/client-server/definitions/public_rooms_chunk.yaml

@@ -17,8 +17,6 @@ title: "PublishedRoomsChunk"
 properties:
   canonical_alias:
     type: string
-    format: mx-room-alias
-    pattern: "^#"
     description: The canonical alias of the room, if any.
     example: "#general:example.org"
   name:
@@ -31,8 +29,6 @@ properties:
     example: 42
   room_id:
     type: string
-    format: mx-room-id
-    pattern: "^!"
     description: The ID of the room.
     example: "!abcdefg:example.org"
   topic:

data/api/client-server/definitions/room_summary.yaml

@@ -27,8 +27,6 @@ allOf:
         type: array
         items:
           type: string
-          format: mx-room-id
-          pattern: "^!"
         description: |-
           If the room is a [restricted room](/server-server-api/#restricted-rooms), these are the room IDs which
           are specified by the join rules. Empty or omitted otherwise.

data/api/client-server/room_summary.yaml

@@ -46,13 +46,7 @@ paths:
           required: true
           example: "#monkeys:matrix.org"
           schema:
-            oneOf:
+            type: string
-              - type: string
-                format: mx-room-id
-                pattern: "^!"
-              - type: string
-                format: mx-room-alias
-                pattern: "^#"
         - in: query
           name: via
           description: |-
@@ -66,7 +60,6 @@ paths:
             type: array
             items:
               type: string
-              format: mx-server-name
       responses:
         "200":
           description: A summary of the room.