Merge 695a97728d into 23ff7f1343

Fix minor typo in content hash calculations (#2128 )
* Fix minor typo in content hash calculations * Changelog
2026-04-29 05:44:10 +02:00 · 2025-04-08 15:13:49 +01:00 · 2025-04-07 14:28:00 -06:00 · 2025-01-31 11:23:26 +00:00 · 2025-01-31 11:21:05 +00:00
4 changed files with 11 additions and 2 deletions
--- a/changelogs/client_server/newsfragments/2068.clarification
+++ b/changelogs/client_server/newsfragments/2068.clarification
@ -0,0 +1 @@
+Clarify behaviour when the `topic` key of a `m.room.topic` event is absent, null, or empty.
--- a/changelogs/server_server/newsfragments/2128.clarification
+++ b/changelogs/server_server/newsfragments/2128.clarification
@ -0,0 +1 @@
+Fix various typos throughout the specification.
--- a/content/server-server-api.md
+++ b/content/server-server-api.md
@ -1337,7 +1337,7 @@ calculated as follows.
 The *content hash* of an event covers the complete event including the
 *unredacted* contents. It is calculated as follows.

-First, any existing `unsigned`, `signature`, and `hashes` members are
+First, any existing `unsigned`, `signatures`, and `hashes` properties are
 removed. The resulting object is then encoded as [Canonical
 JSON](/appendices#canonical-json), and the JSON is hashed using
 SHA-256.
--- a/data/event-schemas/schema/m.room.topic.yaml
+++ b/data/event-schemas/schema/m.room.topic.yaml
@ -1,7 +1,14 @@
 ---
 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 also be set when creating a room using `/createRoom` with the `topic` key.'
+    
+    If a room has an `m.room.topic` event with an absent, null, or empty `topic`
+    field, it should be treated the same as a room with no `m.room.topic` event.
 properties:
  content:
    properties:
Author	SHA1	Message	Date
Will Hunt	276a3fb242	Merge `695a97728d` into `23ff7f1343`	2025-04-08 15:13:49 +01:00
Travis Ralston	23ff7f1343	Fix minor typo in content hash calculations (#2128 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details * Fix minor typo in content hash calculations * Changelog	2025-04-07 14:28:00 -06:00
Will Hunt	695a97728d	Create 2068.clarification	2025-01-31 11:23:26 +00:00
Will Hunt	97dfa16844	Describe behaviour when the `topic` key is falsey in a m.room.topic event. We seem to have [updated this for m.room.name](https://github.com/matrix-org/matrix-spec/pull/1639) some years back but omitted it for topic.	2025-01-31 11:21:05 +00:00
				`@ -0,0 +1 @@`
				Clarify behaviour when the `topic` key of a `m.room.topic` event is absent, null, or empty.
				`@ -0,0 +1 @@`
				`Fix various typos throughout the specification.`