Merge a0cc3f30a9 into bf5fbc9945

changelogs/appendices/newsfragments/2396.clarification

@@ -1 +0,0 @@
-Clarify that clients must avoid producing ambiguous matrix.to URIs. Contributed by @HarHarLinks.

changelogs/client_server/newsfragments/2407.clarification

@@ -1 +0,0 @@
-Add further normative language in mutual rooms server behaviour.

changelogs/client_server/newsfragments/2418.clarification

@@ -1 +0,0 @@
-Rename OlmPayload to OlmPlaintext to avoid confusion with Olm message Payload Bytes.

changelogs/client_server/newsfragments/2422.clarification

@@ -1 +0,0 @@
-Use MXC URI type for all user `avatar_url` fields. Contributed by @networkException.

changelogs/olm_megolm/newsfragments/2421.clarification

@@ -1 +0,0 @@
-Fix typesetting of some symbols in the Olm/Megolm spec.

content/appendices.md

@@ -887,22 +887,20 @@ https://matrix.to/#/<identifier>/<extra parameter>?<additional arguments>
 
 The identifier may be a room ID, room alias, or user ID. The
 extra parameter is only used in the case of permalinks where an event ID
-is referenced. The matrix.to URI, when referenced, MUST always start
+is referenced. The matrix.to URI, when referenced, must always start
 with `https://matrix.to/#/` followed by the identifier.
 
 The `<additional arguments>` and the preceding question mark are
-OPTIONAL and only apply in certain circumstances, documented below.
+optional and only apply in certain circumstances, documented below.
 
-Clients SHOULD NOT rely on matrix.to URIs falling back to a web server
-if accessed and instead SHOULD perform some sort of action within the
+Clients should not rely on matrix.to URIs falling back to a web server
+if accessed and instead should perform some sort of action within the
 client. For example, if the user were to click on a matrix.to URI for a
-room alias, the client MAY open a view for the user to participate in
+room alias, the client may open a view for the user to participate in
 the room.
 
 The components of the matrix.to URI (`<identifier>` and
 `<extra parameter>`) MUST be percent-encoded as per RFC 3986.
-Failure to do so will result in downstream software misinterpreting
-the links as invalid/not turning them into clickable links in UI.
 
 Examples of matrix.to URIs are:
 

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

@@ -1762,9 +1762,12 @@ Messages with type 1 can only be decrypted with an existing session. If
 there is no matching session, the client must treat this as an invalid
 message.
 
-The plaintext corresponding to the "Cipher-Text" in an an [Olm message](/olm-megolm/olm/#normal-messages) is of the form:
+The plaintext payload is of the form:
 
-{{% definition path="api/client-server/definitions/olm_plaintext" %}}
+{{% definition path="api/client-server/definitions/olm_payload" %}}
+
+The type and content of the plaintext message event are given in the
+payload.
 
 If a client has multiple sessions established with another device, it
 should use the session from which it last received and successfully

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

@@ -6,9 +6,9 @@
 
 #### 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`
-with an [opaque identifier](/appendices/#opaque-identifiers). The client can then supply
+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 should populate the optional field `next_batch`
+with an [opaque identifier](/appendices/#opaque-identifiers). The client may 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
 inserts `next_batch`, meaning there are no further results.

content/olm-megolm/megolm.md

@@ -257,8 +257,8 @@ consists of the following key-value pairs:
 
 **Name**|**Tag**|**Type**|**Meaning**
 :-----:|:-----:|:-----:|:-----:
-Message-Index|0x08|Integer|The index of the ratchet, \(i\).
-Cipher-Text|0x12|String|The cipher-text of the message, \(X_i\).
+Message-Index|0x08|Integer|The index of the ratchet, i
+Cipher-Text|0x12|String|The cipher-text, Xi, of the message
 
 Within the payload, integers are encoded using a variable length encoding. Each
 integer is encoded as a sequence of bytes with the high bit set followed by a

content/olm-megolm/olm.md

@@ -17,12 +17,12 @@ side of an \(=\) it means that the output is split.
 When this document uses \(\operatorname{ECDH}\left(K_A,K_B\right)\) it means
 that each party computes a Diffie-Hellman agreement using their private key 
 and the remote party's public key.
-So party \(A\) computes \(\operatorname{ECDH}\left(K_B^{\mathit{public}},K_A^{\mathit{private}}\right)\)
-and party \(B\) computes \(\operatorname{ECDH}\left(K_A^{\mathit{public}},K_B^{\mathit{private}}\right)\).
+So party \(A\) computes \(\operatorname{ECDH}\left(K_B^{public},K_A^{private}\right)\)
+and party \(B\) computes \(\operatorname{ECDH}\left(K_A^{public},K_B^{private}\right)\).
 
-Where this document uses \(\operatorname{HKDF}\left(\mathit{salt},\mathit{IKM},\mathit{info},L\right)\) it
+Where this document uses \(\operatorname{HKDF}\left(salt,IKM,info,L\right)\) it
 refers to the [HMAC-based key derivation function][] with a salt value of
-\(\mathit{salt}\), input key material of \(\mathit{IKM}\), context string \(\mathit{info}\),
+\(salt\), input key material of \(IKM\), context string \(info\),
 and output keying material length of \(L\) bytes.
 
 ## The Olm Algorithm
@@ -226,9 +226,9 @@ significant bits are stored in the first byte.
 
 **Name**|**Tag**|**Type**|**Meaning**
 :-----:|:-----:|:-----:|:-----:
-Ratchet-Key|0x0A|String|The public part of the ratchet key of the message, \(T_i\).
-Chain-Index|0x10|Integer|The chain index of the message, \(j\).
-Cipher-Text|0x22|String|The cipher-text of the message, \(X_{i,j}\).
+Ratchet-Key|0x0A|String|The public part of the ratchet key, Ti, of the message
+Chain-Index|0x10|Integer|The chain index, j, of the message
+Cipher-Text|0x22|String|The cipher-text, Xi, j, of the message
 
 The length of the MAC is determined by the authenticated encryption algorithm
 being used. (Olm version 1 uses [HMAC-SHA-256][], truncated to 8 bytes). The
@@ -251,9 +251,9 @@ The payload uses the same key-value format as for normal messages.
 
 **Name**|**Tag**|**Type**|**Meaning**
 :-----:|:-----:|:-----:|:-----:
-One-Time-Key|0x0A|String|The public part of Bob's single-use key, \(E_B\).
-Base-Key|0x12|String|The public part of Alice's single-use key, \(E_A\).
-Identity-Key|0x1A|String|The public part of Alice's identity key, \(I_A\).
+One-Time-Key|0x0A|String|The public part of Bob's single-use key, Eb.
+Base-Key|0x12|String|The public part of Alice's single-use key, Ea.
+Identity-Key|0x1A|String|The public part of Alice's identity key, Ia.
 Message|0x22|String|An embedded Olm message with its own version and MAC.
 
 ## Olm Authenticated Encryption
@@ -268,13 +268,13 @@ message key using [HKDF-SHA-256][] using the default salt and an info of
 
 \[
 \begin{aligned}
-    \mathit{AES\_KEY}_{i,j}\;\parallel\;\mathit{HMAC\_KEY}_{i,j}\;\parallel\;\mathit{AES\_IV}_{i,j}
+    AES\_KEY_{i,j}\;\parallel\;HMAC\_KEY_{i,j}\;\parallel\;AES\_IV_{i,j}
     &= \operatorname{HKDF}\left(0,M_{i,j},\text{``OLM\_KEYS"},80\right)
 \end{aligned}
 \]
 
-The plain-text is encrypted with AES-256, using the key \(\mathit{AES\_KEY}_{i,j}\)
-and the IV \(\mathit{AES\_IV}_{i,j}\) to give the cipher-text, \(X_{i,j}\).
+The plain-text is encrypted with AES-256, using the key \(AES\_KEY_{i,j}\)
+and the IV \(AES\_IV_{i,j}\) to give the cipher-text, \(X_{i,j}\).
 
 Then the entire message (including the Version Byte and all Payload Bytes) are
 passed through [HMAC-SHA-256][]. The first 8 bytes of the MAC are appended to the message.

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

@@ -14,9 +14,9 @@
 
 
 type: object
-title: OlmPlaintext
+title: OlmPayload
 description: |-
-  The plaintext of an event encrypted using Olm.
+  The plaintext payload of an event encrypted using Olm.
 properties:
   type:
     type: string

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

@@ -54,8 +54,7 @@ properties:
     example: true
   avatar_url:
     type: string
-    format: mx-mxc-uri
-    pattern: "^mxc:\\/\\/"
+    format: uri
     description: The URL for the room's avatar, if one is set.
     example: "mxc://example.org/abcdef"
   join_rule:

data/api/client-server/rooms.yaml

@@ -340,8 +340,7 @@ paths:
                             description: The display name of the user this object is representing.
                           avatar_url:
                             type: string
-                            format: mx-mxc-uri
-                            pattern: "^mxc:\\/\\/"
+                            format: uri
                             description: The avatar of the user this object is representing, as an [`mxc://`
                               URI](/client-server-api/#matrix-content-mxc-uris).
                     description: A map from user ID to a RoomMember object.

data/api/client-server/search.yaml

@@ -238,8 +238,7 @@ paths:
                                               title: Display name
                                             avatar_url:
                                               type: string
-                                              format: mx-mxc-uri
-                                              pattern: "^mxc:\\/\\/"
+                                              format: uri
                                               title: Avatar Url
                                     events_before:
                                       type: array

data/api/client-server/users.yaml

@@ -90,8 +90,7 @@ paths:
                           description: The display name of the user, if one exists.
                         avatar_url:
                           type: string
-                          format: mx-mxc-uri
-                          pattern: "^mxc:\\/\\/"
+                          format: uri
                           example: mxc://bar.com/foo
                           description: The avatar url, as an [`mxc://`
                             URI](/client-server-api/#matrix-content-mxc-uris),

data/api/server-server/query.yaml

@@ -172,8 +172,6 @@ paths:
                     example: John Doe
                   avatar_url:
                     type: string
-                    format: mx-mxc-uri
-                    pattern: "^mxc:\\/\\/"
                     description: |-
                       The avatar URL for the user's avatar. MUST either be omitted or set to
                       `null` if the user does not have an avatar set.

data/event-schemas/schema/m.presence.yaml

@@ -12,8 +12,6 @@
             "properties": {
                 "avatar_url": {
                     "type": "string",
-                    "format": "mx-mxc-uri",
-                    "pattern": "^mxc:\\/\\/",
                     "description": "The current avatar URL for this user, if any."
                 },
                 "displayname": {

data/event-schemas/schema/m.room.member.yaml

@@ -53,8 +53,7 @@ properties:
       avatar_url:
         description: 'The avatar URL for this user, if any.'
         type: string
-        format: mx-mxc-uri
-        pattern: "^mxc:\\/\\/"
+        format: uri
       displayname:
         description: 'The display name for this user, if any.'
         type:

data/event-schemas/schema/m.room_key_bundle.yaml

@@ -13,7 +13,7 @@ description: |-
   [Olm](/client-server-api/#molmv1curve25519-aes-sha2).
 
   The `sender_device_keys` property in the [Olm
-  plaintext](/client-server-api/#definition-olmplaintext) MUST be
+  plaintext](/client-server-api/#definition-olmpayload) MUST be
   populated. Recipients SHOULD ignore `m.room_key_bundle` messages which omit
   them.
 properties: