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

Add a top level presence key for the presence events and remove the public_user_data/private_user_data for now

Browse source
This commit is contained in:
Mark Haines 2015-09-30 10:30:39 +01:00
parent 4cb3f78d2b
commit 931057accf
3 changed files with 11 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,14 +21,9 @@
} }
} }
}, },
"public_user_data": { "presence": {
"description": "description":
"The public user data, e.g. profile and presence, to include.", "The presence updates to include.",
"allOf": [{"$ref": "definitions/event_filter.json"}]
},
"private_user_data": {
"description":
"Events that are private to a user but shared amoungst their devices, e.g. notification settings, to include.",
"allOf": [{"$ref": "definitions/event_filter.json"}] "allOf": [{"$ref": "definitions/event_filter.json"}]
}, },
"event_format": { "event_format": {

22
api/client-server/v2_alpha/filter.yaml
View file

@ -62,14 +62,9 @@ paths:
"not_senders": ["@spam:example.com"] "not_senders": ["@spam:example.com"]
} }
}, },
"public_user_data": { "presence": {
"types": ["m.presence"] "types": ["m.presence"],
}, "not_senders": ["@alice:example.com"]
"private_user_data": {
"types": []
},
"server_data": {
"types": []
}, },
"event_format": "client", "event_format": "client",
"event_fields": ["type", "content", "sender"] "event_fields": ["type", "content", "sender"]
@ -131,14 +126,9 @@ paths:
"not_senders": ["@spam:example.com"] "not_senders": ["@spam:example.com"]
} }
}, },
"public_user_data": { "presence": {
"types": ["m.presence"] "types": ["m.presence"],
}, "not_senders": ["@alice:example.com"]
"private_user_data": {
"types": []
},
"server_data": {
"types": []
}, },
"event_format": "client", "event_format": "client",
"event_fields": ["type", "content", "sender"] "event_fields": ["type", "content", "sender"]

26
api/client-server/v2_alpha/sync.yaml
View file

@ -110,37 +110,17 @@ paths:
in the timeline or state of the room. E.g. typing. in the timeline or state of the room. E.g. typing.
allOf: allOf:
- $ref: "definitions/event_batch.json" - $ref: "definitions/event_batch.json"
public_user_data: presence:
description: |- description: |-
The updates to publicly visible user data. The updates to the presence status of other users.
allOf:
- $ref: "definitions/event_batch.json"
private_user_data:
description: |-
Updates to the data which is private to the user but shared
amongst their devices.
allOf: allOf:
- $ref: "definitions/event_batch.json" - $ref: "definitions/event_batch.json"
examples: examples:
application/json: |- application/json: |-
{ {
"next_batch": "s72595_4483_1934", "next_batch": "s72595_4483_1934",
"private_user_data": { "presence": {
"events": [ "events": [
{
"sender": "@bob:example.com",
"type": "com.example.weird.setting",
"content": {"setting1": true, "setting2": false}
}
]
},
"public_user_data": {
"events": [
{
"sender": "@alice:example.com",
"type": "m.profile.display_name",
"content": {"display_name": "Alice"}
},
{ {
"sender": "@alice:example.com", "sender": "@alice:example.com",
"type": "m.presence", "type": "m.presence",