wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'markjh/room_tags' into markjh/client_config

Browse source 
Conflicts:
	api/client-server/v1/rooms.yaml
	api/client-server/v1/sync.yaml
	api/client-server/v2_alpha/sync.yaml
	specification/targets.yaml
This commit is contained in:
Mark Haines 2015-11-18 15:30:16 +00:00
commit 24c4b8b095
5 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/client-server/v1/rooms.yaml
View file

@ -312,9 +312,9 @@ paths:
}
],
"visibility": "private",
"private_user_data": [{
"account_data": [{
"type": "m.tag",
"content": {"tags": {"work": {"order": 1}}}
"content": {"tags": {"work": {"order": "1"}}}
}]
}
schema:
@ -375,7 +375,7 @@ paths:
description: |-
Whether this room is visible to the ``/publicRooms`` API
or not."
private_user_data:
account_data:
type: array
description: |-
The private data that this user has attached to this room.

4
api/client-server/v1/sync.yaml
View file

@ -254,7 +254,7 @@ paths:
}
],
"visibility": "private",
"private_user_data": [
"account_data": [
{
"type": "m.tag",
"content": {"tags": {"work": {"order": 1}}}
@ -352,7 +352,7 @@ paths:
description: |-
Whether this room is visible to the ``/publicRooms`` API
or not."
private_user_data:
account_data:
type: array
description: |-
The private data that this user has attached to

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

@ -139,7 +139,7 @@ paths:
e.g. typing.
allOf:
- $ref: "definitions/event_batch.json"
private_user_data:
account_data:
title: Private User Data
type: object
description: |-
@ -297,7 +297,7 @@ paths:
}
]
},
"private_user_data": {
"account_data": {
"events": [
{
"type": "m.tags",

4
api/client-server/v2_alpha/tags.yaml
View file

@ -55,7 +55,7 @@ paths:
application/json: |-
{
"tags": {
"work": {"order": 1},
"work": {"order": "1"},
"pinned": {}
}
}
@ -97,7 +97,7 @@ paths:
schema:
type: object
example: |-
{"order": 1}
{"order": "1"}
responses:
200:
description: