Merge 4d310046a1 into 1edf62c3f1

changelogs/client_server/newsfragments/2412.clarification

@@ -1 +0,0 @@
-Use the User ID type in OlmPayload and DeviceKeys.

content/client-server-api/modules/mutual_rooms.md

@@ -7,7 +7,7 @@
 #### Server behaviour
 
 The server MAY decide that the response to this endpoint is too large, and only return a
-subset of the results. In this case, the server populates the optional field `next_batch`
+subset of the results. In this case, the server MUST populate the optional field `next_batch`
 with an [opaque identifier](/appendices/#opaque-identifiers). The client can then supply
 the identifier as the `from` query parameter in a subsequent request, along with the original
 `user_id`, to fetch the next batch of responses. This will continue until the server no longer

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

@@ -20,8 +20,6 @@ properties:
     description: |-
       The ID of the user the device belongs to. Must match the user ID used
       when logging in.
-    format: mx-user-id
-    pattern: "^@"
     example: "@alice:example.com"
   device_id:
     type: string

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

@@ -27,13 +27,9 @@ properties:
   sender:
     type: string
     description: The user ID of the event sender.
-    format: mx-user-id
-    pattern: "^@"
   recipient:
     type: string
     description: The user ID of the intended event recipient.
-    format: mx-user-id
-    pattern: "^@"
   recipient_keys:
     description: The recipient's signing keys of the encrypted event.
     $ref: "#/components/schemas/SigningKeys"