Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-01 17:24:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'markjh/account_data_filters' into markjh/room_filter

Browse source
This commit is contained in:
Mark Haines 2015-12-21 20:38:50 +00:00
parent e413f05c87 a32ed96a0f
commit 2ea66e9300
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/client-server/definitions/sync_filter.yaml
View file

@ -20,6 +20,10 @@ properties:
allOf: allOf:
- $ref: event_filter.yaml - $ref: event_filter.yaml
description: The presence updates to include. description: The presence updates to include.
account_data:
allOf:
- $ref: event_filter.yaml
description: The user account data that isn't associated with rooms to include.
room: room:
properties: properties:
ephemeral: ephemeral:
@ -38,5 +42,9 @@ properties:
allOf: allOf:
- $ref: room_event_filter.yaml - $ref: room_event_filter.yaml
description: The message and state update events to include for rooms. description: The message and state update events to include for rooms.
account_data:
allOf:
- $ref: room_event_filter.yaml
description: The per user account data to include for rooms.
type: object type: object
type: object type: object