Merge b47858b981 into f9dec5dc92

changelogs/client_server/newsfragments/2422.clarification

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

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: