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

Fix examples of StrippedState in s2s spec

Browse source
This commit is contained in:
Travis Ralston 2019-06-02 17:50:27 -06:00
parent 7a07a6b358
commit b9c4a2561f
2 changed files with 11 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

53
api/server-server/invites-v1.yaml
View file

@ -83,16 +83,8 @@ paths:
canonical alias, avatar, and name of the room. canonical alias, avatar, and name of the room.
items: items:
$ref: "../client-server/definitions/event-schemas/schema/stripped_state.yaml" $ref: "../client-server/definitions/event-schemas/schema/stripped_state.yaml"
example: [ example:
{ $ref: "../client-server/definitions/event-schemas/examples/stripped_state.json"
"type": "m.room.join_rules",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
}
]
example: { example: {
"$ref": "examples/minimal_pdu.json", "$ref": "examples/minimal_pdu.json",
"type": "m.room.member", "type": "m.room.member",
@ -100,26 +92,6 @@ paths:
"origin": "example.org", "origin": "example.org",
"origin_server_ts": 1549041175876, "origin_server_ts": 1549041175876,
"sender": "@someone:example.org", "sender": "@someone:example.org",
"unsigned": {
"invite_room_state": [
{
"type": "m.room.join_rules",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
},
{
"type": "m.room.name",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"name": "Cool New Room"
}
}
]
},
"content": { "content": {
"membership": "invite" "membership": "invite"
}, },
@ -162,24 +134,9 @@ paths:
"origin_server_ts": 1549041175876, "origin_server_ts": 1549041175876,
"sender": "@someone:example.org", "sender": "@someone:example.org",
"unsigned": { "unsigned": {
"invite_room_state": [ "invite_room_state": {
{ "$ref": "../../client-server/definitions/event-schemas/examples/stripped_state.json"
"type": "m.room.join_rules", }
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
},
{
"type": "m.room.name",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"name": "Cool New Room"
}
}
]
}, },
"content": { "content": {
"membership": "invite" "membership": "invite"

53
api/server-server/invites-v2.yaml
View file

@ -84,16 +84,8 @@ paths:
canonical alias, avatar, and name of the room. canonical alias, avatar, and name of the room.
items: items:
$ref: "../client-server/definitions/event-schemas/schema/stripped_state.yaml" $ref: "../client-server/definitions/event-schemas/schema/stripped_state.yaml"
example: [ example:
{ $ref: "../client-server/definitions/event-schemas/examples/stripped_state.json"
"type": "m.room.join_rules",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
}
]
required: ['room_version', 'event'] required: ['room_version', 'event']
example: { example: {
"room_version": "2", "room_version": "2",
@ -112,25 +104,7 @@ paths:
"ed25519:key_version": "SomeSignatureHere" "ed25519:key_version": "SomeSignatureHere"
}, },
} }
}, }
"invite_room_state": [
{
"type": "m.room.join_rules",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
},
{
"type": "m.room.name",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"name": "Cool New Room"
}
}
]
} }
responses: responses:
200: 200:
@ -156,24 +130,9 @@ paths:
"origin_server_ts": 1549041175876, "origin_server_ts": 1549041175876,
"sender": "@someone:example.org", "sender": "@someone:example.org",
"unsigned": { "unsigned": {
"invite_room_state": [ "invite_room_state": {
{ "$ref": "../../client-server/definitions/event-schemas/examples/stripped_state.json"
"type": "m.room.join_rules", }
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"join_rule": "public"
}
},
{
"type": "m.room.name",
"sender": "@someone:matrix.org",
"state_key": "",
"content": {
"name": "Cool New Room"
}
}
]
}, },
"content": { "content": {
"membership": "invite" "membership": "invite"