Merge 7f0431b95f into 817ec5380f

Create funding-manifest-urls (#2115 )
* Create funding-manifest-urls * update funding-manifest-urls location, add news Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --------- Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com>
2026-04-20 01:44:09 +02:00 · 2025-03-28 14:09:57 +00:00 · 2025-03-28 13:19:23 +00:00 · 2025-03-28 13:34:29 +01:00 · 2025-03-27 10:30:02 -06:00 · 2025-03-27 10:28:55 -06:00
56 changed files with 261 additions and 63 deletions
--- a/changelogs/appendices/newsfragments/1506.clarification
+++ b/changelogs/appendices/newsfragments/1506.clarification
@ -1 +0,0 @@
-Clarify that arbitrary unicode is allowed in user/room IDs and room aliases.
--- a/changelogs/client_server/newsfragments/2036.clarification
+++ b/changelogs/client_server/newsfragments/2036.clarification
@ -1 +0,0 @@
-The `POST /_matrix/client/v3/rooms/{roomId}/initialSync` endpoint is no longer deprecated, as it is still used for peeking.
--- a/changelogs/client_server/newsfragments/2038.clarification
+++ b/changelogs/client_server/newsfragments/2038.clarification
@ -1 +0,0 @@
-Clarify wording in the `/join` endpoints' summaries and descriptions. Contributed by @HarHarLinks.
--- a/changelogs/client_server/newsfragments/2046.clarification
+++ b/changelogs/client_server/newsfragments/2046.clarification
@ -1 +0,0 @@
-Clarify formats of string types.
--- a/changelogs/client_server/newsfragments/2047.clarification
+++ b/changelogs/client_server/newsfragments/2047.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2048.clarification
+++ b/changelogs/client_server/newsfragments/2048.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2051.clarification
+++ b/changelogs/client_server/newsfragments/2051.clarification
@ -1 +0,0 @@
-Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`.
--- a/changelogs/client_server/newsfragments/2055.clarification
+++ b/changelogs/client_server/newsfragments/2055.clarification
@ -1 +0,0 @@
-Applying redactions is a SHOULD for clients.
--- a/changelogs/client_server/newsfragments/2059.removal
+++ b/changelogs/client_server/newsfragments/2059.removal
@ -1 +0,0 @@
-Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).
--- a/changelogs/client_server/newsfragments/2064.clarification
+++ b/changelogs/client_server/newsfragments/2064.clarification
@ -1 +0,0 @@
-Clarify which rooms are returned from `/hierarchy`.
--- a/changelogs/client_server/newsfragments/2072.clarification
+++ b/changelogs/client_server/newsfragments/2072.clarification
@ -1 +0,0 @@
-Clients can choose which history visibility options they offer to users when creating rooms.
--- a/changelogs/client_server/newsfragments/2080.clarification
+++ b/changelogs/client_server/newsfragments/2080.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2091.clarification
+++ b/changelogs/client_server/newsfragments/2091.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2093.new
+++ b/changelogs/client_server/newsfragments/2093.new
@ -1 +0,0 @@
-Add `POST /_matrix/client/v3/users/{userId}/report`, as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260).
--- a/changelogs/client_server/newsfragments/2095.feature
+++ b/changelogs/client_server/newsfragments/2095.feature
@ -0,0 +1 @@
+Add `m.topic` content block to enable rich text in `m.room.topic` events as per [MSC3765](https://github.com/matrix-org/matrix-spec-proposals/pull/3765).
--- a/changelogs/internal/newsfragments/2033.clarification
+++ b/changelogs/internal/newsfragments/2033.clarification
@ -1 +0,0 @@
-Generate the changelog release info with Hugo, rather than the changelog generation script.
--- a/changelogs/internal/newsfragments/2041.clarification
+++ b/changelogs/internal/newsfragments/2041.clarification
@ -1 +0,0 @@
-Update release steps documentation.
--- a/changelogs/internal/newsfragments/2042.clarification
+++ b/changelogs/internal/newsfragments/2042.clarification
@ -1 +0,0 @@
-Remove unused `release_date` from Hugo config.
--- a/changelogs/internal/newsfragments/2045.clarification
+++ b/changelogs/internal/newsfragments/2045.clarification
@ -1 +0,0 @@
-Clarify that v1.0 of Matrix was a release prior to the current global versioning system.
--- a/changelogs/internal/newsfragments/2049.clarification
+++ b/changelogs/internal/newsfragments/2049.clarification
@ -1 +0,0 @@
-Fix syntax highlighting and click-to-copy buttons for code blocks by purging less CSS.
--- a/changelogs/internal/newsfragments/2061.clarification
+++ b/changelogs/internal/newsfragments/2061.clarification
@ -1 +0,0 @@
-Fix the version of the Identity Service API when Matrix 1.0 was introduced.
--- a/changelogs/internal/newsfragments/2069.clarification
+++ b/changelogs/internal/newsfragments/2069.clarification
@ -1 +0,0 @@
-Fix parsing of nested slices in `resolve-refs` and `resolve-allof` partials.
--- a/changelogs/internal/newsfragments/2073.clarification
+++ b/changelogs/internal/newsfragments/2073.clarification
@ -1 +0,0 @@
-Deduplicate the definition of `RoomKeysUpdateResponse`.
--- a/changelogs/internal/newsfragments/2074.clarification
+++ b/changelogs/internal/newsfragments/2074.clarification
@ -1 +0,0 @@
-Deduplicate the definitions of `Invite3pid`.
--- a/changelogs/internal/newsfragments/2076.clarification
+++ b/changelogs/internal/newsfragments/2076.clarification
@ -1 +0,0 @@
-Support more locations for examples in OpenAPI definitions and JSON schemas.
--- a/changelogs/internal/newsfragments/2078.clarification
+++ b/changelogs/internal/newsfragments/2078.clarification
@ -1 +0,0 @@
-Add link to the git commit for the unstable changelog.
--- a/changelogs/internal/newsfragments/2115.clarification
+++ b/changelogs/internal/newsfragments/2115.clarification
@ -0,0 +1 @@
+Add [well-known funding manifest urls](https://floss.fund/funding-manifest/) to spec to authorise https://matrix.org/funding.json. Contributed by @HarHarLinks.
--- a/changelogs/room_versions/newsfragments/2065.clarification
+++ b/changelogs/room_versions/newsfragments/2065.clarification
@ -1 +0,0 @@
-For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions.
--- a/changelogs/room_versions/newsfragments/2066.clarification
+++ b/changelogs/room_versions/newsfragments/2066.clarification
@ -1 +0,0 @@
-Fix various typos throughout the specification.
--- a/changelogs/room_versions/newsfragments/2070.clarification
+++ b/changelogs/room_versions/newsfragments/2070.clarification
@ -1 +0,0 @@
-Refactor PDU definitions to reduce duplication.
--- a/changelogs/room_versions/newsfragments/2105.feature
+++ b/changelogs/room_versions/newsfragments/2105.feature
@ -1 +0,0 @@
-Update the default room version to 11, as per [MSC4239](https://github.com/matrix-org/matrix-spec-proposals/pull/4239).
--- a/changelogs/server_server/newsfragments/2050.clarification
+++ b/changelogs/server_server/newsfragments/2050.clarification
@ -1 +0,0 @@
-Remove the `origin` field in `PUT /send_join` responses, because it was never sent in the first place.
--- a/changelogs/server_server/newsfragments/2063.clarification
+++ b/changelogs/server_server/newsfragments/2063.clarification
@ -1 +0,0 @@
-Clarify that `m.join_rules` should be in the `auth_events` of an `m.room.member` event with a `membership` of `knock`.
--- a/changelogs/server_server/newsfragments/2076.clarification
+++ b/changelogs/server_server/newsfragments/2076.clarification
@ -1 +0,0 @@
-Remove an erroneous `room_id` field in a few examples.
--- a/changelogs/server_server/newsfragments/2095.feature
+++ b/changelogs/server_server/newsfragments/2095.feature
@ -0,0 +1 @@
+Add `m.topic` content block to enable rich text in `m.room.topic` events as per [MSC3765](https://github.com/matrix-org/matrix-spec-proposals/pull/3765).
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@ -67,7 +67,7 @@ current_version_url = "https://spec.matrix.org/latest"
 # The following is used when status = "stable", and is displayed in various UI elements on a released version
 # of the spec.
 # major = "1"
-# minor = "13"
+# minor = "14"

 # User interface configuration
 [params.ui]
--- a/content/changelog/v1.14.md
+++ b/content/changelog/v1.14.md
@ -0,0 +1,93 @@
+---
+title: v1.14 Changelog
+linkTitle: v1.14
+type: docs
+layout: changelog
+outputs:
+  - html
+  - checklist
+date: 2025-03-27
+---
+
+## Client-Server API
+
+**New Endpoints**
+
+- Add `POST /_matrix/client/v3/users/{userId}/report`, as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260). ([#2093](https://github.com/matrix-org/matrix-spec/issues/2093))
+
+**Removed Endpoints**
+
+- Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213). ([#2059](https://github.com/matrix-org/matrix-spec/issues/2059))
+
+**Spec Clarifications**
+
+- The `POST /_matrix/client/v3/rooms/{roomId}/initialSync` endpoint is no longer deprecated, as it is still used for peeking. ([#2036](https://github.com/matrix-org/matrix-spec/issues/2036))
+- Clarify wording in the `/join` endpoints' summaries and descriptions. Contributed by @HarHarLinks. ([#2038](https://github.com/matrix-org/matrix-spec/issues/2038))
+- Clarify formats of string types. ([#2046](https://github.com/matrix-org/matrix-spec/issues/2046))
+- Fix various typos throughout the specification. ([#2047](https://github.com/matrix-org/matrix-spec/issues/2047), [#2048](https://github.com/matrix-org/matrix-spec/issues/2048), [#2080](https://github.com/matrix-org/matrix-spec/issues/2080), [#2091](https://github.com/matrix-org/matrix-spec/issues/2091))
+- Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`. ([#2051](https://github.com/matrix-org/matrix-spec/issues/2051))
+- Applying redactions is a SHOULD for clients. ([#2055](https://github.com/matrix-org/matrix-spec/issues/2055))
+- Clarify which rooms are returned from `/hierarchy`. ([#2064](https://github.com/matrix-org/matrix-spec/issues/2064))
+- Clients can choose which history visibility options they offer to users when creating rooms. ([#2072](https://github.com/matrix-org/matrix-spec/issues/2072))
+
+
+## Server-Server API
+
+**Spec Clarifications**
+
+- Remove the `origin` field in `PUT /send_join` responses, because it was never sent in the first place. ([#2050](https://github.com/matrix-org/matrix-spec/issues/2050))
+- Clarify that `m.join_rules` should be in the `auth_events` of an `m.room.member` event with a `membership` of `knock`. ([#2063](https://github.com/matrix-org/matrix-spec/issues/2063))
+- Remove an erroneous `room_id` field in a few examples. ([#2076](https://github.com/matrix-org/matrix-spec/issues/2076))
+
+
+## Application Service API
+
+No significant changes.
+
+
+## Identity Service API
+
+No significant changes.
+
+
+## Push Gateway API
+
+No significant changes.
+
+
+## Room Versions
+
+**Backwards Compatible Changes**
+
+- Update the default room version to 11, as per [MSC4239](https://github.com/matrix-org/matrix-spec-proposals/pull/4239). ([#2105](https://github.com/matrix-org/matrix-spec/issues/2105))
+
+**Spec Clarifications**
+
+- For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checked and that events with rejected auth events must be rejected, for parity with all the other room versions. ([#2065](https://github.com/matrix-org/matrix-spec/issues/2065))
+- Fix various typos throughout the specification. ([#2066](https://github.com/matrix-org/matrix-spec/issues/2066))
+- Refactor PDU definitions to reduce duplication. ([#2070](https://github.com/matrix-org/matrix-spec/issues/2070))
+- Clarify the maximum `depth` value for room versions 6, 7, 8, 9, 10, and 11. ([#2114](https://github.com/matrix-org/matrix-spec/issues/2114))
+
+
+## Appendices
+
+**Spec Clarifications**
+
+- Clarify that arbitrary unicode is allowed in user/room IDs and room aliases. ([#1506](https://github.com/matrix-org/matrix-spec/issues/1506))
+
+
+## Internal Changes/Tooling
+
+**Spec Clarifications**
+
+- Generate the changelog release info with Hugo, rather than the changelog generation script. ([#2033](https://github.com/matrix-org/matrix-spec/issues/2033))
+- Update release steps documentation. ([#2041](https://github.com/matrix-org/matrix-spec/issues/2041))
+- Remove unused `release_date` from Hugo config. ([#2042](https://github.com/matrix-org/matrix-spec/issues/2042))
+- Clarify that v1.0 of Matrix was a release prior to the current global versioning system. ([#2045](https://github.com/matrix-org/matrix-spec/issues/2045))
+- Fix syntax highlighting and click-to-copy buttons for code blocks by purging less CSS. ([#2049](https://github.com/matrix-org/matrix-spec/issues/2049))
+- Fix the version of the Identity Service API when Matrix 1.0 was introduced. ([#2061](https://github.com/matrix-org/matrix-spec/issues/2061))
+- Fix parsing of nested slices in `resolve-refs` and `resolve-allof` partials. ([#2069](https://github.com/matrix-org/matrix-spec/issues/2069))
+- Deduplicate the definition of `RoomKeysUpdateResponse`. ([#2073](https://github.com/matrix-org/matrix-spec/issues/2073))
+- Deduplicate the definitions of `Invite3pid`. ([#2074](https://github.com/matrix-org/matrix-spec/issues/2074))
+- Support more locations for examples in OpenAPI definitions and JSON schemas. ([#2076](https://github.com/matrix-org/matrix-spec/issues/2076))
+- Add link to the git commit for the unstable changelog. ([#2078](https://github.com/matrix-org/matrix-spec/issues/2078))
--- a/content/client-server-api/modules/search.md
+++ b/content/client-server-api/modules/search.md
@ -26,9 +26,10 @@ on certain keys of certain event types.

 The supported keys to search over are:

-   `content.body` in `m.room.message`
-   `content.name` in `m.room.name`
-   `content.topic` in `m.room.topic`
+-   `content.body` in [`m.room.message`](#mroommessage)
+-   `content.name` in [`m.room.name`](#mroomname)
+-   `content.topic` as well as the `body` of the `text/plain` representation
+     in [`m.room.topic`](#mroomtopic)

 The search will *not* include rooms that are end to end encrypted.

--- a/content/rooms/fragments/v6-event-format.md
+++ b/content/rooms/fragments/v6-event-format.md
@ -0,0 +1,4 @@
+
+Events in rooms of this version have the following structure:
+
+{{% definition path="api/server-server/definitions/pdu_v6" %}}
--- a/content/rooms/v10.md
+++ b/content/rooms/v10.md
@ -281,7 +281,7 @@ completeness.

 ### Event format

-{{% rver-fragment name="v4-event-format" %}}
+{{% rver-fragment name="v6-event-format" %}}

 ### State resolution

--- a/content/rooms/v6.md
+++ b/content/rooms/v6.md
@ -39,6 +39,13 @@ in [room version 5](/rooms/v5).

 [See above](#redactions).

+### Event format
+
+{{% added-in v=6 %}} Through enforcement of [Canonical JSON](#canonical-json),
+the `depth` limit has been reduced in this room version.
+
+{{% rver-fragment name="v6-event-format" %}}
+
 ### Authorization rules

 {{% added-in v=6 %}} Rule 4, which related specifically to events
@ -229,10 +236,6 @@ completeness.

 {{% rver-fragment name="v4-event-ids" %}}

-### Event format
-
-{{% rver-fragment name="v4-event-format" %}}
-
 #### Deprecated event content schemas

 {{% rver-fragment name="v1-deprecated-formatting-off-spec" %}}
--- a/content/rooms/v7.md
+++ b/content/rooms/v7.md
@ -225,7 +225,7 @@ completeness.

 ### Event format

-{{% rver-fragment name="v4-event-format" %}}
+{{% rver-fragment name="v6-event-format" %}}

 #### Deprecated event content schemas

--- a/content/rooms/v8.md
+++ b/content/rooms/v8.md
@ -109,7 +109,7 @@ completeness.

 ### Event format

-{{% rver-fragment name="v4-event-format" %}}
+{{% rver-fragment name="v6-event-format" %}}

 #### Deprecated event content schemas

--- a/content/rooms/v9.md
+++ b/content/rooms/v9.md
@ -74,7 +74,7 @@ completeness.

 ### Event format

-{{% rver-fragment name="v4-event-format" %}}
+{{% rver-fragment name="v6-event-format" %}}

 #### Deprecated event content schemas

--- a/data/api/client-server/create_room.yaml
+++ b/data/api/client-server/create_room.yaml
@ -109,15 +109,17 @@ paths:
                name:
                  type: string
                  description: |-
-                    If this is included, an `m.room.name` event will be sent
-                    into the room to indicate the name of the room. See Room
-                    Events for more information on `m.room.name`.
+                    If this is included, an [`m.room.name`](#mroomname) event
+                    will be sent into the room to indicate the name for the room.
+                    This overwrites any [`m.room.name`](#mroomname) event in
+                    `initial_state`.
                topic:
                  type: string
                  description: |-
-                    If this is included, an `m.room.topic` event will be sent
-                    into the room to indicate the topic for the room. See Room
-                    Events for more information on `m.room.topic`.
+                    If this is included, an [`m.room.topic`](#mroomtopic) event
+                    with a `text/plain` mimetype will be sent into the room to
+                    indicate the topic for the room. This overwrites any
+                    [`m.room.topic`](#mroomtopic) event in `initial_state`.
                invite:
                  type: array
                  description: |-
--- a/data/api/client-server/definitions/public_rooms_chunk.yaml
+++ b/data/api/client-server/definitions/public_rooms_chunk.yaml
@ -33,7 +33,9 @@ properties:
    example: "!abcdefg:example.org"
  topic:
    type: string
-    description: The topic of the room, if any.
+    description: |-
+      The plaintext topic of the room. Omitted if no `text/plain` mimetype
+      exists in [`m.room.topic`](/client-server-api/#mroomtopic).
    example: "All things general"
  world_readable:
    type: boolean
--- a/data/api/server-server/definitions/components/pdu_base.yaml
+++ b/data/api/server-server/definitions/components/pdu_base.yaml
@ -41,13 +41,6 @@ properties:
    type: object
    description: The content of the event.
    example: {"key": "value"}
-  depth:
-    type: integer
-    description: |-
-      The maximum depth of the `prev_events`, plus one. Must be less than the
-      maximum value for an integer (2^63 - 1). If the room's depth is already at
-      the limit, the depth must be set to the limit.
-    example: 12
  hashes:
    $ref: "event_hash.yaml"
  signatures:
--- a/data/api/server-server/definitions/pdu_v1.yaml
+++ b/data/api/server-server/definitions/pdu_v1.yaml
@ -28,6 +28,13 @@ allOf:
        type: string
        description: For redaction events, the ID of the event being redacted.
        example: "$def456:matrix.org"
+      depth:
+        type: integer
+        description: |-
+          The maximum depth of the `prev_events`, plus one. Must be less than the
+          maximum value for an integer (2^63 - 1). If the room's depth is already at
+          the limit, the depth must be set to the limit.
+        example: 12
      auth_events:
        type: array
        description: |-
--- a/data/api/server-server/definitions/pdu_v11.yaml
+++ b/data/api/server-server/definitions/pdu_v11.yaml
@ -17,6 +17,16 @@ description: A persistent data unit (event) for room version 11 and beyond.
 example:
  $ref: "../examples/pdu_v11.json"
 allOf:
-  # v11 is the v4 event, but without redacts.
+  # v11 is the v6 event, but without redacts.
  - $ref: "components/pdu_base.yaml"
-  - $ref: "components/auth_events_prev_events_v4.yaml"
+  - $ref: "components/auth_events_prev_events_v4.yaml"
+  - type: object
+    properties:
+      # v6 enforces Canonical JSON and therefore needs a depth limit change
+      depth:
+        type: integer
+        description: |-
+          The maximum depth of the `prev_events`, plus one. Must be less than the
+          maximum value for an integer (2^53 - 1). If the room's depth is already at
+          the limit, the depth must be set to the limit.
+        example: 12
--- a/data/api/server-server/definitions/pdu_v3.yaml
+++ b/data/api/server-server/definitions/pdu_v3.yaml
@ -24,6 +24,13 @@ allOf:
        type: string
        description: For redaction events, the ID of the event being redacted.
        example: "$def/456+oldevent"
+      depth:
+        type: integer
+        description: |-
+          The maximum depth of the `prev_events`, plus one. Must be less than the
+          maximum value for an integer (2^63 - 1). If the room's depth is already at
+          the limit, the depth must be set to the limit.
+        example: 12
      auth_events:
        type: array
        items:
--- a/data/api/server-server/definitions/pdu_v4.yaml
+++ b/data/api/server-server/definitions/pdu_v4.yaml
@ -26,3 +26,10 @@ allOf:
        type: string
        description: For redaction events, the ID of the event being redacted.
        example: "$def_456-oldevent"
+      depth:
+        type: integer
+        description: |-
+          The maximum depth of the `prev_events`, plus one. Must be less than the
+          maximum value for an integer (2^63 - 1). If the room's depth is already at
+          the limit, the depth must be set to the limit.
+        example: 12
--- a/data/api/server-server/definitions/pdu_v6.yaml
+++ b/data/api/server-server/definitions/pdu_v6.yaml
@ -0,0 +1,36 @@
+# Copyright 2025 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+type: object
+title: Persistent Data Unit
+description: |-
+  A persistent data unit (event) for room versions 4, 5, 6, 7, 8, 9 and 10.
+example:
+  $ref: "../examples/pdu_v4.json"
+allOf:
+  - $ref: "components/pdu_base.yaml"
+  - $ref: "components/auth_events_prev_events_v4.yaml"
+  - type: object
+    properties:
+      redacts:
+        type: string
+        description: For redaction events, the ID of the event being redacted.
+        example: "$def_456-oldevent"
+      # v6 enforces Canonical JSON and therefore needs a depth limit change
+      depth:
+        type: integer
+        description: |-
+          The maximum depth of the `prev_events`, plus one. Must be less than the
+          maximum value for an integer (2^53 - 1). If the room's depth is already at
+          the limit, the depth must be set to the limit.
+        example: 12
--- a/data/event-schemas/examples/m.room.topic.yaml
+++ b/data/event-schemas/examples/m.room.topic.yaml
@ -3,6 +3,14 @@
  "type": "m.room.topic",
  "state_key": "",
  "content": {
-    "topic": "A room topic"
+    "m.topic": {
+      "m.text": [ {
+        "mimetype": "text/html",
+        "body": "An <em>interesting</em> room topic"
+      }, {
+        "body": "An interesting room topic"
+      }]
+    },
+    "topic": "An interesting room topic"
  }
 }
--- a/data/event-schemas/schema/components/m_text_content_block.yaml
+++ b/data/event-schemas/schema/components/m_text_content_block.yaml
@ -0,0 +1,28 @@
+type: array
+description: |-
+  An ordered array of textual representations in different mimetypes.
+
+  Senders SHOULD specify at least one representation and SHOULD always
+  include a plaintext representation.
+  
+  Receivers SHOULD use the first representation in the array that
+  they understand.
+title: TextContentBlock
+items:
+  type: object
+  title: TextualRepresentation
+  properties:
+    mimetype:
+      type: string
+      description: The mimetype. Defaults to `text/plain` if omitted.
+      example: "text/html"
+    body:
+      type: string
+      description: |-
+        The string content.
+
+        Clients SHOULD validate and sanitize the content as they do
+        for rich content associated with [`msgtype`](#mroommessage-msgtypes)
+        of [`m.room.message`](#mroommessage).
+  required:
+  - body
--- a/data/event-schemas/schema/m.room.topic.yaml
+++ b/data/event-schemas/schema/m.room.topic.yaml
@ -1,13 +1,38 @@
 ---
 allOf:
  - $ref: core-event-schema/state_event.yaml
-description: 'A topic is a short message detailing what is currently being discussed in the room.  It can also be used as a way to display extra information about the room, which may not be suitable for the room name. The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
+description: |-
+  A topic is a short message detailing what is currently being discussed
+  in the room.  It can also be used as a way to display extra information
+  about the room, which may not be suitable for the room name. The room
+  topic can be set when creating a room using
+  [`/createRoom`](client-server-api/#post_matrixclientv3createroom), either
+  with the `topic` key or by specifying a full event in `initial_state`.
+  
+  In order to prevent formatting abuse in room topics, clients SHOULD
+  limit the length of topics during both entry and display, for instance,
+  by capping the number of displayed lines. Additionally, clients SHOULD
+  ignore things like headings and enumerations (or format them as regular
+  text).
 properties:
  content:
    properties:
      topic:
-        description: The topic text.
+        description: |-
+          The topic in plain text.
+
+          This SHOULD duplicate the content of the `text/plain`
+          representation in `m.topic` if any exists.
        type: string
+      m.topic:
+        type: object
+        title: TopicContentBlock
+        x-addedInMatrixVersion: "1.15"
+        description: |-
+          Textual representation of the room topic in different mimetypes.
+        properties:
+          m.text:
+            $ref: components/m_text_content_block.yaml
    required:
      - topic
    type: object
--- a/static/.well-known/funding-manifest-urls
+++ b/static/.well-known/funding-manifest-urls
@ -0,0 +1 @@
+https://matrix.org/funding.json
Author	SHA1	Message	Date
Johannes Marbach	bfecd906b3	Merge `7f0431b95f` into `817ec5380f`	2025-03-28 14:09:57 +00:00
Kim Brose	817ec5380f	Create funding-manifest-urls (#2115 ) * Create funding-manifest-urls * update funding-manifest-urls location, add news Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --------- Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com>	2025-03-28 13:19:23 +00:00
Johannes Marbach	7f0431b95f	Bump version to 1.15	2025-03-28 13:34:29 +01:00
Travis Ralston	029be205b9	-> unstable Some checks are pending Spec / 🔎 Validate OpenAPI specifications (push) Waiting to run Details Spec / 🔎 Check Event schema examples (push) Waiting to run Details Spec / 🔎 Check OpenAPI definitions examples (push) Waiting to run Details Spec / 🔎 Check JSON Schemas inline examples (push) Waiting to run Details Spec / ⚙️ Calculate baseURL for later jobs (push) Waiting to run Details Spec / 🐍 Build OpenAPI definitions (push) Blocked by required conditions Details Spec / 📢 Run towncrier for changelog (push) Waiting to run Details Spec / 📖 Build the spec (push) Blocked by required conditions Details Spec / 🔎 Validate generated HTML (push) Blocked by required conditions Details Spec / 📖 Build the historical backup spec (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details	2025-03-27 10:30:02 -06:00
Travis Ralston	fe880fdaf4	v1.14	2025-03-27 10:28:55 -06:00
Travis Ralston	71ce620fc0	Add a v6 event format with correct `depth` limits (#2114 ) * Add a v6 event format with correct `depth` limits * Changelog * numbers are hard	2025-03-27 10:23:09 -06:00
Johannes Marbach	d060142a8d	Line-wrap first paragraph, update link and parameters	2025-03-20 10:36:27 +01:00
Johannes Marbach	43f8f68402	Don't use semantically different texts for different mimetypes in the topic example	2025-03-20 10:29:26 +01:00
Johannes Marbach	9ca647f5ee	Update data/api/client-server/create_room.yaml Co-authored-by: Kévin Commaille <76261501+zecakeh@users.noreply.github.com>	2025-03-20 10:20:06 +01:00
Johannes Marbach	743a035335	Add changelog	2025-03-14 10:09:24 +01:00
Johannes Marbach	a20ff4a09a	MSC3765: Rich text in room topics Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-03-14 10:02:47 +01:00
				`@ -1 +0,0 @@`
				`Clarify that arbitrary unicode is allowed in user/room IDs and room aliases.`
				`@ -1 +0,0 @@`
				The `POST /_matrix/client/v3/rooms/{roomId}/initialSync` endpoint is no longer deprecated, as it is still used for peeking.
				`@ -1 +0,0 @@`
				Clarify wording in the `/join` endpoints' summaries and descriptions. Contributed by @HarHarLinks.
				`@ -1 +0,0 @@`
				`Fix various typos throughout the specification.`
				`@ -1 +0,0 @@`
				Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`.
				`@ -1 +0,0 @@`
				`Applying redactions is a SHOULD for clients.`
				`@ -1 +0,0 @@`
				Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).
				`@ -1 +0,0 @@`
				Clarify which rooms are returned from `/hierarchy`.
				`@ -1 +0,0 @@`
				`Clients can choose which history visibility options they offer to users when creating rooms.`