Merge 3c17aa3789 into fb4a0d8f66

changelogs/application_service/newsfragments/2182.clarification

@@ -1 +0,0 @@
-Minor fixes to JSON schemas.

changelogs/client_server/newsfragments/2182.clarification

@@ -1 +0,0 @@
-Minor fixes to JSON schemas.

data/api/application-service/definitions/protocol.yaml

@@ -23,4 +23,3 @@ allOf:
       type: array
       items:
         $ref: protocol_instance.yaml
-  required: ['instances']

data/api/application-service/definitions/protocol_base.yaml

@@ -77,4 +77,4 @@ properties:
         "placeholder": "#foobar"
       }
     }
-required: ['user_fields', 'location_fields', 'icon', 'field_types']
+required: ['user_fields', 'location_fields', 'icon', 'field_types', 'instances']

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

@@ -41,4 +41,3 @@ allOf:
                   This is the identifier to use as the `third_party_instance_id` in a request to
                   [`POST /_matrix/client/v3/publicRooms`](/client-server-api/#post_matrixclientv3publicrooms).
                 example: "irc-freenode"
-  required: ['instances']

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

@@ -42,3 +42,9 @@ allOf:
       room_version:
         description: The version of the room.
         type: string
+
+required:
+  - room_id
+  - num_joined_members
+  - world_readable
+  - guest_can_join

data/api/client-server/room_summary.yaml

@@ -89,6 +89,11 @@ paths:
                           - leave
                           - ban
                         type: string
+                required:
+                  - guest_can_join
+                  - num_joined_members
+                  - room_id
+                  - world_readable
               examples:
                 response:
                   value: {

data/event-schemas/schema/core-event-schema/room_event.yaml

@@ -1,8 +1,6 @@
-title: RoomEvent
-description: Room Events have the following fields.
 allOf:
 - $ref: sync_room_event.yaml
-- type: object
+description: Room Events have the following fields.
 properties:
   room_id:
     description: |-
@@ -11,3 +9,5 @@ allOf:
     type: string
 required:
 - room_id
+title: RoomEvent
+type: object

data/event-schemas/schema/core-event-schema/sync_room_event.yaml

@@ -17,12 +17,10 @@
 # be on events, so we give it a whole event structure as a base for room_event.
 # This base doesn't declare a room_id, which instead appears in the room_event.
 
-title: SyncRoomEvent
-description: In addition to the Event fields, Room Events have the following additional
-  fields.
 allOf:
 - $ref: event.yaml
-- type: object
+description: In addition to the Event fields, Room Events have the following additional
+  fields.
 properties:
   event_id:
     description: The globally unique event identifier.
@@ -41,3 +39,5 @@ allOf:
 - event_id
 - sender
 - origin_server_ts
+title: SyncRoomEvent
+type: object

data/event-schemas/schema/core-event-schema/sync_state_event.yaml

@@ -14,12 +14,10 @@
 
 # See sync_room_event.yaml for why this file is here.
 
-title: SyncStateEvent
-description: In addition to the Room Event fields, State Events have the following
-  additional fields.
 allOf:
 - $ref: sync_room_event.yaml
-- type: object
+description: In addition to the Room Event fields, State Events have the following
+  additional fields.
 properties:
   state_key:
     description: A unique key which defines the overwriting semantics for this piece
@@ -32,3 +30,5 @@ allOf:
     type: string
 required:
 - state_key
+title: SyncStateEvent
+type: object