From e0e67748667bd58c03691dd7998fc96f7f39d86b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 26 Jan 2022 18:17:41 +0000 Subject: [PATCH 1/5] Remove 'room_id' field from EDU example --- data/event-schemas/examples/core/room_edu.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/event-schemas/examples/core/room_edu.json b/data/event-schemas/examples/core/room_edu.json index 30ad80818d2..dc57b506ba3 100644 --- a/data/event-schemas/examples/core/room_edu.json +++ b/data/event-schemas/examples/core/room_edu.json @@ -1,4 +1,3 @@ { - "$ref": "event.json", - "room_id": "!jEsUZKDJdhlrceRyVU:example.org" + "$ref": "event.json" } From e691b23b0e791a168ff1ae0583609a40b9af26b7 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 28 Jan 2022 09:36:15 +0000 Subject: [PATCH 2/5] Remove 'room_id' from m.typing schema --- data/event-schemas/schema/m.typing.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/event-schemas/schema/m.typing.yaml b/data/event-schemas/schema/m.typing.yaml index 705b3b6c7af..426d9860cdf 100644 --- a/data/event-schemas/schema/m.typing.yaml +++ b/data/event-schemas/schema/m.typing.yaml @@ -23,9 +23,6 @@ "type": "string", "enum": ["m.typing"] }, - "room_id": { - "type": "string" - } }, "required": ["type", "room_id", "content"] } From b27339b2625c5e9f0c2f9c1d90e3d798dcdbf1c0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 8 Feb 2022 20:08:36 +0000 Subject: [PATCH 3/5] Remove room_id from m.typing and m.receipt schema --- data/event-schemas/schema/m.receipt.yaml | 5 +---- data/event-schemas/schema/m.typing.yaml | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/data/event-schemas/schema/m.receipt.yaml b/data/event-schemas/schema/m.receipt.yaml index 4b04e6d68e1..56d4b341765 100644 --- a/data/event-schemas/schema/m.receipt.yaml +++ b/data/event-schemas/schema/m.receipt.yaml @@ -42,10 +42,7 @@ "type": { "type": "string", "enum": ["m.receipt"] - }, - "room_id": { - "type": "string" } }, - "required": ["room_id", "type", "content"] + "required": ["type", "content"] } diff --git a/data/event-schemas/schema/m.typing.yaml b/data/event-schemas/schema/m.typing.yaml index 426d9860cdf..1613334f24c 100644 --- a/data/event-schemas/schema/m.typing.yaml +++ b/data/event-schemas/schema/m.typing.yaml @@ -22,7 +22,7 @@ "type": { "type": "string", "enum": ["m.typing"] - }, + } }, - "required": ["type", "room_id", "content"] + "required": ["type", "content"] } From 598fb33b05daf4f41c4ccc1e502bb1d53072519b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 8 Feb 2022 20:14:23 +0000 Subject: [PATCH 4/5] Additionally remove room_id from m.fully_read room account data --- data/event-schemas/examples/m.fully_read.yaml | 1 - data/event-schemas/schema/m.fully_read.yaml | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/data/event-schemas/examples/m.fully_read.yaml b/data/event-schemas/examples/m.fully_read.yaml index 0af2a6ea668..f314c803d4b 100644 --- a/data/event-schemas/examples/m.fully_read.yaml +++ b/data/event-schemas/examples/m.fully_read.yaml @@ -1,7 +1,6 @@ { "$ref": "core/event.json", "type": "m.fully_read", - "room_id": "!somewhere:example.org", "content": { "event_id": "$someplace:example.org" } diff --git a/data/event-schemas/schema/m.fully_read.yaml b/data/event-schemas/schema/m.fully_read.yaml index 51a1942f003..6f8c832d5cf 100644 --- a/data/event-schemas/schema/m.fully_read.yaml +++ b/data/event-schemas/schema/m.fully_read.yaml @@ -19,11 +19,7 @@ "type": { "type": "string", "enum": ["m.fully_read"] - }, - "room_id": { - "type": "string", - "description": "The room ID the read marker applies to." } }, - "required": ["type", "room_id", "content"] + "required": ["type", "content"] } From 9449e079844e3563a63620912b4a082be927dcdc Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 1 Mar 2022 14:28:18 +0000 Subject: [PATCH 5/5] Changelog --- changelogs/client_server/newsfragments/3679.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/3679.clarification diff --git a/changelogs/client_server/newsfragments/3679.clarification b/changelogs/client_server/newsfragments/3679.clarification new file mode 100644 index 00000000000..93f416fce2e --- /dev/null +++ b/changelogs/client_server/newsfragments/3679.clarification @@ -0,0 +1 @@ +Remove erroneous `room_id` field from examples of `m.read`, `m.typing` in `/sync` and `m.fully_read` in room account data. \ No newline at end of file