mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-02-17 03:23:42 +01:00
Merge 3c17aa3789 into 7c39427d8b
This commit is contained in:
commit
a15b0dadcc
|
|
@ -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.
|
||||||
|
|
@ -374,8 +374,14 @@ paths:
|
||||||
description: |-
|
description: |-
|
||||||
The [stripped state events](/client-server-api/#stripped-state) that form the
|
The [stripped state events](/client-server-api/#stripped-state) that form the
|
||||||
invite state.
|
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:
|
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
|
type: array
|
||||||
knock:
|
knock:
|
||||||
title: Knocked rooms
|
title: Knocked rooms
|
||||||
|
|
@ -399,8 +405,14 @@ paths:
|
||||||
description: |-
|
description: |-
|
||||||
The [stripped state events](/client-server-api/#stripped-state) that form the
|
The [stripped state events](/client-server-api/#stripped-state) that form the
|
||||||
knock state.
|
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:
|
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
|
type: array
|
||||||
leave:
|
leave:
|
||||||
title: Left rooms
|
title: Left rooms
|
||||||
|
|
@ -633,6 +645,8 @@ paths:
|
||||||
"sender": "@alice:example.com",
|
"sender": "@alice:example.com",
|
||||||
"type": "m.room.member",
|
"type": "m.room.member",
|
||||||
"state_key": "@bob:example.com",
|
"state_key": "@bob:example.com",
|
||||||
|
"event_id": "$19dl9d3848dJLle:example.com",
|
||||||
|
"origin_server_ts": 1432735439654,
|
||||||
"content": {
|
"content": {
|
||||||
"membership": "invite"
|
"membership": "invite"
|
||||||
}
|
}
|
||||||
|
|
@ -657,6 +671,8 @@ paths:
|
||||||
"sender": "@bob:example.com",
|
"sender": "@bob:example.com",
|
||||||
"type": "m.room.member",
|
"type": "m.room.member",
|
||||||
"state_key": "@bob:example.com",
|
"state_key": "@bob:example.com",
|
||||||
|
"event_id": "$Fg83Kl3764di23a:example.com",
|
||||||
|
"origin_server_ts": 143273039402,
|
||||||
"content": {
|
"content": {
|
||||||
"membership": "knock"
|
"membership": "knock"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue