Merge 332d867c86 into 23ff7f1343

Fix minor typo in content hash calculations (#2128 )
* Fix minor typo in content hash calculations * Changelog
2026-03-07 12:14:10 +01:00 · 2025-04-08 15:13:50 +01:00 · 2025-04-07 14:28:00 -06:00 · 2025-03-17 18:40:52 +01:00 · 2025-03-17 18:34:21 +01:00
3 changed files with 5 additions and 3 deletions
--- a/changelogs/server_server/newsfragments/2100.clarification
+++ b/changelogs/server_server/newsfragments/2100.clarification
@ -0,0 +1 @@
+Clarify that auth event of `content.join_authorised_via_users_server` is only necessary for `m.room.member` with a `membership` of `join`.
--- 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
@ -543,8 +543,8 @@ the following subset of the room state:
      `third_party_invite` property, the current
      `m.room.third_party_invite` event with `state_key` matching
      `content.third_party_invite.signed.token`, if any.
-    - If `content.join_authorised_via_users_server` is present,
-      and the [room version supports restricted rooms](/rooms/#feature-matrix),
+    - If `membership` is `join`, `content.join_authorised_via_users_server`
+      is present, and the [room version supports restricted rooms](/rooms/#feature-matrix),
      then the `m.room.member` event with `state_key` matching
      `content.join_authorised_via_users_server`.

@ -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.
Author	SHA1	Message	Date
Kévin Commaille	8adf2828d8	Merge `332d867c86` into `23ff7f1343`	2025-04-08 15:13:50 +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
Kévin Commaille	332d867c86	Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-03-17 18:40:52 +01:00
Kévin Commaille	75ba4a98bf	Clarify that `join_authorised_via_users_server` auth event is only necessary for join Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-03-17 18:34:21 +01:00
				`@ -0,0 +1 @@`
				Clarify that auth event of `content.join_authorised_via_users_server` is only necessary for `m.room.member` with a `membership` of `join`.
				`@ -0,0 +1 @@`
				`Fix various typos throughout the specification.`