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

Merge branch 'master' of github.com:matrix-org/matrix-doc

Browse source
This commit is contained in:
Oddvar Lovaas 2016-02-23 17:34:26 +00:00
commit 65b776b4ec
2 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

45
api/client-server/joining.yaml
View file

@ -51,14 +51,12 @@ paths:
example: |- example: |-
{ {
"third_party_signed": { "third_party_signed": {
"signed": { "sender": "@cat:the.hat",
"sender": "@cat:the.hat", "mxid": "@green:eggs.ham",
"mxid": "@green:eggs.ham", "token": "random8nonce",
"token": "random8nonce", "signatures": {
"signatures": { "horton.hears": {
"horton.hears": { "ed25519:0": "some9signature"
"ed25519:0": "some9signature"
}
} }
} }
} }
@ -69,25 +67,20 @@ paths:
title: ThirdPartySigned title: ThirdPartySigned
description: A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room. description: A signature of an ``m.third_party_invite`` token to prove that this user owns a third party identity which has been invited to the room.
properties: properties:
signed: sender:
type: string
description: The Matrix ID of the user who issued the invite.
mxid:
type: string
description: The Matrix ID of the invitee.
token:
type: string
description: The state key of the m.third_party_invite event.
signatures:
type: object type: object
title: Signed description: A signatures object containing a signature of the entire signed object.
properties: title: Signatures
sender: required: ["sender", "mxid", "token", "signatures"]
type: string
description: The Matrix ID of the user who issued the invite.
mxid:
type: string
description: The Matrix ID of the invitee.
token:
type: string
description: The state key of the m.third_party_invite event.
signatures:
type: object
description: A signatures object containing a signature of the entire signed object.
title: Signatures
required: ["sender", "mxid", "token", "signatures"]
required: ["signed"]
responses: responses:
200: 200:
description: |- description: |-

2
templating/matrix_templates/templates/events.tmpl
View file

@ -6,7 +6,7 @@
{{event.typeof_info}} {{event.typeof_info}}
{{event.desc | wrap(80)}} {{event.desc | wrap(80)}}
{% for table in event.content_fields -%} {% for table in event.content_fields %}
{{"``"+table.title+"``" if table.title else "" }} {{"``"+table.title+"``" if table.title else "" }}
{{ tables.paramtable(table.rows, [(table.title or "Content") ~ " Key", "Type", "Description"]) }} {{ tables.paramtable(table.rows, [(table.title or "Content") ~ " Key", "Type", "Description"]) }}