Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-27 03:18:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Split the event_filter into a event_filter and a room_event_filter that

Browse source 
extends it.

So that we don't include "rooms" and "not_rooms" keys for the public_user_data
and private_user_data filters.
This commit is contained in:
Mark Haines 2015-09-28 13:20:01 +01:00
parent 00fd4aac26
commit 41bc09ea22
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
api/client-server/v2_alpha/definitions/event_filter.json
View file

@ -37,22 +37,6 @@
"items": {
"type": "string"
}
},
"rooms": {
"type": "array",
"description":
"A list of room IDs to include. If this list is absent then all rooms are included.",
"items": {
"type": "string"
}
},
"not_rooms": {
"type": "array",
"description":
"A list of room IDs to exclude. If this list is absent then no rooms are excluded.",
"items": {
"type": "string"
}
}
}
}

21
api/client-server/v2_alpha/definitions/room_event_filter.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "object",
"properties": {
"rooms": {
"type": "array",
"description":
"A list of room IDs to include. If this list is absent then all rooms are included.",
"items": {
"type": "string"
}
},
"not_rooms": {
"type": "array",
"description":
"A list of room IDs to exclude. If this list is absent then no rooms are excluded.",
"items": {
"type": "string"
}
}
}
}

6
api/client-server/v2_alpha/definitions/sync_filter.json
View file

@ -7,17 +7,17 @@
"state": {
"description":
"The state events to include for rooms.",
"allOf": [{"$ref": "definitions/event_filter.json"}]
"allOf": [{"$ref": "definitions/room_event_filter.json"}]
},
"timeline": {
"description":
"The message and state update events to include for rooms.",
"allOf": [{"$ref": "definitions/event_filter.json"}]
"allOf": [{"$ref": "definitions/room_event_filter.json"}]
},
"ephemeral": {
"description":
"The events that aren't recorded in the room history, e.g. typing and receipts, to include for rooms.",
"allOf": [{"$ref": "definitions/event_filter.json"}]
"allOf": [{"$ref": "definitions/room_event_filter.json"}]
}
}
},