Merge 54f32b72de into 22f3cc009b

Fix typo for origin_server_ts field for in-room verification events (#2337 )
* Fix typo for origin_server_ts field for in-room verification events Signed-off-by: tusooa <tusooa@kazv.moe> * Update changelogs/client_server/newsfragments/2337.clarification --------- Signed-off-by: tusooa <tusooa@kazv.moe> Co-authored-by: Travis Ralston <travpc@gmail.com>
2026-05-03 07:34:10 +02:00 · 2026-03-17 09:12:45 +00:00 · 2026-03-17 01:20:11 +00:00 · 2026-03-17 01:18:37 +00:00
6 changed files with 5 additions and 2 deletions
--- a/changelogs/client_server/newsfragments/2328.feature
+++ b/changelogs/client_server/newsfragments/2328.feature
@ -1 +1 @@
-Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/423O).
+Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
--- a/changelogs/client_server/newsfragments/2337.clarification
+++ b/changelogs/client_server/newsfragments/2337.clarification
@ -0,0 +1 @@
 Fix various typos throughout the specification.
--- a/changelogs/client_server/newsfragments/2338.feature
+++ b/changelogs/client_server/newsfragments/2338.feature
@ -0,0 +1 @@
 Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
--- a/changelogs/server_server/newsfragments/2329.clarification
+++ b/changelogs/server_server/newsfragments/2329.clarification
--- a/changelogs/server_server/newsfragments/2338.clarification
+++ b/changelogs/server_server/newsfragments/2338.clarification
@ -0,0 +1 @@
 Fix various typos throughout the specification.
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -637,7 +637,7 @@ request.
 The prompt for Bob to accept/reject Alice's request (or the unsupported method
 prompt) should be automatically dismissed 10 minutes after the `timestamp` (in
-the case of to-device messages) or `origin_ts` (in the case of in-room
+the case of to-device messages) or `origin_server_ts` (in the case of in-room
 messages) field or 2 minutes after Bob's client receives the message, whichever
 comes first, if Bob does not interact with the prompt. The prompt should
 additionally be hidden if an appropriate `m.key.verification.cancel` message is
Author	SHA1	Message	Date
Helix K	be0567a0fd	Merge `54f32b72de` into `22f3cc009b`	2026-03-17 09:12:45 +00:00
No.	22f3cc009b	Fix typo for origin_server_ts field for in-room verification events (#2337 ) 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 Spec / Create release (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details * Fix typo for origin_server_ts field for in-room verification events Signed-off-by: tusooa <tusooa@kazv.moe> * Update changelogs/client_server/newsfragments/2337.clarification --------- Signed-off-by: tusooa <tusooa@kazv.moe> Co-authored-by: Travis Ralston <travpc@gmail.com>	2026-03-17 01:20:11 +00:00
Kévin Commaille	ce3aecab38	Fix newsfragments (#2338 ) * Fix typo in newsfragment Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Fix location of newsfragment Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Add changelogs Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> * Update changelogs/server_server/newsfragments/2338.clarification --------- Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr> Co-authored-by: Travis Ralston <travpc@gmail.com>	2026-03-17 01:18:37 +00:00
`@ -1 +1 @@`
	Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/423O).	Add the `is_animated` flag to the `info` object of the `m.image` msgtype and the `m.sticker` event, as per [MSC4230](https://github.com/matrix-org/matrix-spec-proposals/pull/4230).
		`@ -0,0 +1 @@`
							`Fix various typos throughout the specification.`