diff --git a/changelogs/client_server/newsfragments/3679.clarification b/changelogs/client_server/newsfragments/3679.clarification new file mode 100644 index 00000000..93f416fc --- /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 diff --git a/data/event-schemas/examples/core/room_edu.json b/data/event-schemas/examples/core/room_edu.json index 30ad8081..dc57b506 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" } diff --git a/data/event-schemas/examples/m.fully_read.yaml b/data/event-schemas/examples/m.fully_read.yaml index 0af2a6ea..f314c803 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 51a1942f..6f8c832d 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"] } diff --git a/data/event-schemas/schema/m.receipt.yaml b/data/event-schemas/schema/m.receipt.yaml index 4b04e6d6..56d4b341 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 705b3b6c..1613334f 100644 --- a/data/event-schemas/schema/m.typing.yaml +++ b/data/event-schemas/schema/m.typing.yaml @@ -22,10 +22,7 @@ "type": { "type": "string", "enum": ["m.typing"] - }, - "room_id": { - "type": "string" } }, - "required": ["type", "room_id", "content"] + "required": ["type", "content"] }