Merge 5268f3df12 into 866c05f487

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

@@ -61,7 +61,6 @@ properties:
     example: "public"
   room_type:
     type: string
-    x-addedInMatrixVersion: "1.4"
     description: |-
       The `type` of room (from [`m.room.create`](/client-server-api/#mroomcreate)), if any.
 required:

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

@@ -23,7 +23,6 @@ allOf:
         description: The `type` of room (from
           [`m.room.create`](/client-server-api/#mroomcreate)),
           if any.
-        x-addedInMatrixVersion: "1.4"
       allowed_room_ids:
         type: array
         items:

data/api/client-server/room_summary.yaml

@@ -71,8 +71,6 @@ paths:
                   - $ref: ../client-server/definitions/room_summary.yaml
                   - type: object
                     properties:
-                      room_type:
-                        x-addedInMatrixVersion: # Overrides room_summary.yaml
                       membership:
                         description: |-
                           The membership state of the user if the user is joined to the room. Absent

data/api/client-server/space_hierarchy.yaml

@@ -125,6 +125,8 @@ paths:
                                         description: The `origin_server_ts` for the event.
                                     required:
                                       - origin_server_ts
+                            room_type:
+                              x-addedInMatrixVersion: "1.4" # Extends room_summary.yaml
                             allowed_room_ids:
                               x-addedInMatrixVersion: "1.15" # Extends room_summary.yaml
                             encryption:

data/api/server-server/space_hierarchy.yaml

@@ -84,6 +84,8 @@ paths:
                                       description: The `origin_server_ts` for the event.
                                   required:
                                     - origin_server_ts
+                          room_type:
+                            x-addedInMatrixVersion: "1.4" # Extends room_summary.yaml
                           encryption:
                             x-addedInMatrixVersion: "1.15" # Extends room_summary.yaml
                           room_version:
@@ -101,6 +103,8 @@ paths:
                         - type: object
                           title: SpaceHierarchyChildRoomsChunk
                           properties:
+                            room_type:
+                              x-addedInMatrixVersion: "1.4" # Extends room_summary.yaml
                             encryption:
                               x-addedInMatrixVersion: "1.15" # Extends room_summary.yaml
                             room_version: