Merge e3ca1ba2b8 into 156d1b878a

changelogs/client_server/newsfragments/2347.clarification

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

content/client-server-api/_index.md

@@ -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
-    the currently selected room, with an `?at` parameter set to the
-    `/sync` response's `from` token. The member list for the room is
-    then maintained by the state in subsequent incremental `/sync`
-    responses.
+    should call /members for the currently selected room, with an `?at`
+    parameter set to the /sync response's from token. The member list
+    for the room is then maintained by the state in subsequent
+    incremental /sync 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.