Merge 3c17aa3789 into fe3f43a905

Point Olm and Megolm links at the new internal specification (#2242 )
Relates to: #1543 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2026-04-29 13:54:10 +02:00 · 2025-11-02 13:58:24 -06:00 · 2025-10-31 13:52:15 +00:00 · 2025-10-31 11:02:16 +00:00 · 2025-07-25 10:44:39 +02:00 · 2025-07-25 09:56:33 +02:00
6 changed files with 28 additions and 8 deletions
--- a/changelogs/client_server/newsfragments/2181.clarification
+++ b/changelogs/client_server/newsfragments/2181.clarification
@ -0,0 +1,2 @@
+Clarify that the stripped state in `invite_state` and `knock_state` in `GET /sync` response must
+include the full `m.room.member` event of the user.
--- a/changelogs/internal/newsfragments/2241.clarification
+++ b/changelogs/internal/newsfragments/2241.clarification
@ -0,0 +1 @@
+Inline Olm & Megolm specifications.
--- a/changelogs/internal/newsfragments/2242.clarification
+++ b/changelogs/internal/newsfragments/2242.clarification
@ -0,0 +1 @@
+Inline Olm & Megolm specifications.
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -1457,8 +1457,8 @@ readers without adding any useful extra information.
 ##### `m.olm.v1.curve25519-aes-sha2`

 The name `m.olm.v1.curve25519-aes-sha2` corresponds to version 1 of the
-Olm ratchet, as defined by the [Olm
-specification](http://matrix.org/docs/spec/olm.html). This uses:
+Olm ratchet, as defined by the [Olm specification](/olm-megolm/olm).
+This uses:

 -   Curve25519 for the initial key agreement.
 -   HKDF-SHA-256 for ratchet key derivation.
@ -1631,8 +1631,8 @@ This is due to a deprecation of the fields. See
 {{% changed-in v="1.3" %}}

 The name `m.megolm.v1.aes-sha2` corresponds to version 1 of the Megolm
-ratchet, as defined by the [Megolm
-specification](http://matrix.org/docs/spec/megolm.html). This uses:
+ratchet, as defined by the [Megolm specification](/olm-megolm/megolm).
+This uses:

 -   HMAC-SHA-256 for the hash ratchet.
 -   HKDF-SHA-256, AES-256 in CBC mode, and 8 byte truncated HMAC-SHA-256
--- a/data/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@ -369,8 +369,14 @@ paths:
                                    description: |-
                                      The [stripped state events](/client-server-api/#stripped-state) that form the
                                      invite state.
+
+                                      MUST also include the `m.room.member` event of the user with a membership of
+                                      `invite`, and using the same event format as joined rooms with the `event_id`
+                                      and `origin_server_ts` fields.
                                    items:
-                                      $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                      anyOf:
+                                        - $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                        - $ref: definitions/client_event_without_room_id.yaml
                                    type: array
                      knock:
                        title: Knocked rooms
@ -394,8 +400,14 @@ paths:
                                    description: |-
                                      The [stripped state events](/client-server-api/#stripped-state) that form the
                                      knock state.
+
+                                      MUST also include the `m.room.member` event of the user with a membership of
+                                      `knock`, and using the same event format as joined rooms with the `event_id` and
+                                      `origin_server_ts` fields.
                                    items:
-                                      $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                      anyOf:
+                                        - $ref: ../../event-schemas/schema/core-event-schema/stripped_state.yaml
+                                        - $ref: definitions/client_event_without_room_id.yaml
                                    type: array
                      leave:
                        title: Left rooms
@ -628,6 +640,8 @@ paths:
                                "sender": "@alice:example.com",
                                "type": "m.room.member",
                                "state_key": "@bob:example.com",
+                                "event_id": "$19dl9d3848dJLle:example.com",
+                                "origin_server_ts": 1432735439654,
                                "content": {
                                  "membership": "invite"
                                }
@ -652,6 +666,8 @@ paths:
                                "sender": "@bob:example.com",
                                "type": "m.room.member",
                                "state_key": "@bob:example.com",
+                                "event_id": "$Fg83Kl3764di23a:example.com",
+                                "origin_server_ts": 143273039402,
                                "content": {
                                  "membership": "knock"
                                }
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@ -13,8 +13,8 @@
  <head>
    {{ partial "head.html" . }}
    {{ if .Page.Store.Get "hasMath" }}
-      <link href="/css/katex.min.css" rel="preload" as="style">
-      <link href="/css/katex.min.css" rel="stylesheet">
+      <link href="{{ relURL "css/katex.min.css" }}" rel="preload" as="style">
+      <link href="{{ relURL "css/katex.min.css" }}" rel="stylesheet">
    {{ end }}
  </head>
  <body class="td-{{ .Kind }}{{ with .Page.Params.body_class }} {{ . }}{{ end }}">
Author	SHA1	Message	Date
Kévin Commaille	f3e51f5884	Merge `3c17aa3789` into `fe3f43a905`	2025-11-02 13:58:24 -06:00
Johannes Marbach	fe3f43a905	Point Olm and Megolm links at the new internal specification (#2242 ) 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 Relates to: #1543 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-31 13:52:15 +00:00
Richard van der Hoff	4783619964	Fix broken link to katex CSS (#2241 ) 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 Followup to https://github.com/matrix-org/matrix-spec/pull/2226, which broke the build. These links to the static CSS are broken in the case that the spec is built for a subdirectory (such as `unstable`).	2025-10-31 11:02:16 +00:00
Kévin Commaille	3c17aa3789	Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-07-25 10:44:39 +02:00
Kévin Commaille	506bc1a164	Clarify that stripped state in /sync response must include `m.room.member` event of user And that event has the same format as in join rooms, with `event_id` and `origin_server_ts`. This has always been the case in homeserver implementations. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-07-25 09:56:33 +02:00