Skip to content

Commit bed1aba

Browse files
committed
Clarify to not use timeline with state_after
Signed-off-by: Kévin Commaille <[email protected]>
1 parent 802403e commit bed1aba

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

data/api/client-server/sync.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,10 @@ paths:
259259
{{% /boxes/note %}}
260260
261261
If this field is set, even if it is empty, clients MUST
262-
only update their local state with events in this list.
263-
If this field is not set, clients MUST update their local
264-
state with events in `state` and `timeline`.
262+
only update their local state with events in this list,
263+
and MUST NOT update their local state with events in
264+
`timeline`. If this field is not set, clients MUST update
265+
their local state with events in `state` and `timeline`.
265266
266267
**Required** if `use_state_after` was set to `true` in the
267268
request, even if it is empty.
@@ -426,7 +427,8 @@ paths:
426427
The state updates for the room up to the **end** of the timeline.
427428
428429
If this field is set, even if it is empty, clients MUST only
429-
update their local state with events in this list. If this field
430+
update their local state with events in this list, and MUST NOT
431+
update their local state with events in `timeline`. If this field
430432
is not set, clients MUST update their local state with events in
431433
`state` and `timeline`.
432434

0 commit comments

Comments
 (0)