Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-04-29 13:54:10 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix merge

Browse source
This commit is contained in:
Travis Ralston 2018-08-31 09:33:30 -06:00
parent 2e3e189ea2
commit fc037b3a72
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
event-schemas/schema/core-event-schema/sync_room_event.yaml
View file

@ -31,7 +31,8 @@ properties:
origin_server_ts: origin_server_ts:
description: Timestamp in milliseconds on originating homeserver description: Timestamp in milliseconds on originating homeserver
when this event was sent. when this event was sent.
type: number type: integer
format: int64
unsigned: unsigned:
description: Contains optional extra information about the event. description: Contains optional extra information about the event.
properties: properties:

4
event-schemas/schema/core-event-schema/sync_state_event.yaml
View file

@ -28,6 +28,10 @@ properties:
description: A unique key which defines the overwriting semantics for this piece description: A unique key which defines the overwriting semantics for this piece
of room state. This value is often a zero-length string. The presence of this of room state. This value is often a zero-length string. The presence of this
key makes this event a State Event. key makes this event a State Event.
State keys starting with an ``@`` are reserved for referencing user IDs, such
as room members. With the exception of a few events, state events set with a
given user's ID as the state key MUST only be set by that user.
type: string type: string
required: required:
- state_key - state_key