Merge 37b1b8eebe into 9c014a9045

changelogs/client_server/newsfragments/2347.clarification

@@ -1 +0,0 @@
-Clarify formats of string types.

changelogs/client_server/newsfragments/2348.clarification

@@ -1 +0,0 @@
-Fix ordering of common error codes.

content/client-server-api/_index.md

@@ -126,25 +126,6 @@ state (e.g.: sending messages, account data, etc) and not routes which
 only read state (e.g.: [`/sync`](#get_matrixclientv3sync),
 [`/user/{userId}/account_data/{type}`](#get_matrixclientv3useruseridaccount_datatype), etc).
 
-`M_UNKNOWN`
-: An unknown error has occurred.
-
-`M_UNKNOWN_DEVICE`
-: {{% added-in v="1.17" %}} The device ID supplied by the application service does
-not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
-
-`M_UNKNOWN_TOKEN`
-: The access or refresh token specified was not recognised.
-
-: An additional response parameter, `soft_logout`, might be present on the
-response for 401 HTTP status codes. See [the soft logout
-section](#soft-logout) for more information.
-
-`M_UNRECOGNIZED`
-: The server did not understand the request. This is expected to be returned with
-a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
-code if the endpoint is implemented, but the incorrect HTTP method is used.
-
 `M_USER_LIMIT_EXCEEDED`
 : {{% added-in v="1.18" %}} The request cannot be completed because the user has
 exceeded (or the request would cause them to exceed) a limit associated with
@@ -176,6 +157,25 @@ limit is a hard limit that cannot be increased.
   }
   ```
 
+`M_UNKNOWN`
+: An unknown error has occurred.
+
+`M_UNKNOWN_DEVICE`
+: {{% added-in v="1.17" %}} The device ID supplied by the application service does
+not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
+
+`M_UNKNOWN_TOKEN`
+: The access or refresh token specified was not recognised.
+
+: An additional response parameter, `soft_logout`, might be present on the
+response for 401 HTTP status codes. See [the soft logout
+section](#soft-logout) for more information.
+
+`M_UNRECOGNIZED`
+: The server did not understand the request. This is expected to be returned with
+a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
+code if the endpoint is implemented, but the incorrect HTTP method is used.
+
 `M_USER_LOCKED`
 : The account has been [locked](#account-locking) and cannot be used at this time.
 
@@ -3120,20 +3120,19 @@ events they have already been sent, and choose to skip sending membership
 events for members whose membership has not changed. These are called
 'redundant membership events'. Clients may request that redundant membership
 events are always included in responses by setting `include_redundant_members`
-to `true` in the filter.
+to true in the filter.
 
 The expected pattern for using lazy-loading is currently:
 
--   Client performs an initial `/sync` with lazy-loading enabled, and
+-   Client performs an initial /sync with lazy-loading enabled, and
     receives only the membership events which relate to the senders of
     the events it receives.
 -   Clients which support display-name tab-completion or other
     operations which require rapid access to all members in a room
-    should call [`/members`](#get_matrixclientv3roomsroomidmembers) for
+    should call /members for the currently selected room, with an `?at`
-    the currently selected room, with an `?at` parameter set to the
+    parameter set to the /sync response's from token. The member list
-    `/sync` response's `from` token. The member list for the room is
+    for the room is then maintained by the state in subsequent
-    then maintained by the state in subsequent incremental `/sync`
+    incremental /sync responses.
-    responses.
 -   Clients which do not support tab-completion may instead pull in
     profiles for arbitrary users (e.g. read receipts, typing
     notifications) on demand by querying the room state or [`/profile`](#get_matrixclientv3profileuserid).

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

@@ -26,8 +26,6 @@ properties:
       `senders` filter.
     items:
       type: string
-      format: mx-user-id
-      pattern: "^@"
     type: array
   not_types:
     description: A list of event types to exclude. If this list is absent then no
@@ -42,8 +40,6 @@ properties:
       senders are included.
     items:
       type: string
-      format: mx-user-id
-      pattern: "^@"
     type: array
   types:
     description: A list of event types to include. If this list is absent then all

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

@@ -43,16 +43,12 @@ allOf:
         filter.
       items:
         type: string
-        format: mx-room-id
-        pattern: "^!"
       type: array
     rooms:
       description: A list of room IDs to include. If this list is absent then all rooms
         are included.
       items:
         type: string
-        format: mx-room-id
-        pattern: "^!"
       type: array
     contains_url:
       type: boolean

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

@@ -50,8 +50,6 @@ properties:
           `state`, `timeline` or `account_data`
         items:
           type: string
-          format: mx-room-id
-          pattern: "^!"
         type: array
       rooms:
         description: A list of room IDs to include. If this list is absent then all rooms
@@ -59,8 +57,6 @@ properties:
           `state`, `timeline` or `account_data`
         items:
           type: string
-          format: mx-room-id
-          pattern: "^!"
         type: array
       ephemeral:
         allOf:

data/api/client-server/filter.yaml

@@ -36,8 +36,6 @@ paths:
           example: "@alice:example.com"
           schema:
             type: string
-            format: mx-user-id
-            pattern: "^@"
       requestBody:
         content:
           application/json:
@@ -132,8 +130,6 @@ paths:
           example: "@alice:example.com"
           schema:
             type: string
-            format: mx-user-id
-            pattern: "^@"
         - in: path
           name: filterId
           description: The filter ID to download.