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

More consistency around 'resident homeserver'

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2015-11-16 15:34:11 +00:00
parent 36af793f05
commit 923f05e554
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
specification/server_server_api.rst
View file

@ -613,7 +613,7 @@ The resident server replies to this request with a JSON-encoded object having a
single key called ``event``; within this is an object whose fields contain some single key called ``event``; within this is an object whose fields contain some
of the information that the joining server will need. Despite its name, this of the information that the joining server will need. Despite its name, this
object is not a full event; notably it does not need to be hashed or signed by object is not a full event; notably it does not need to be hashed or signed by
the assisting resident. The required fields are: the resident homeserver. The required fields are:
==================== ======== ============ ==================== ======== ============
Key Type Description Key Type Description
@ -625,9 +625,9 @@ the assisting resident. The required fields are:
``content`` Object The event content ``content`` Object The event content
``depth`` Integer (this field must be present but is ignored; it ``depth`` Integer (this field must be present but is ignored; it
may be 0) may be 0)
``event_id`` String A new event ID specified by the assisting ``event_id`` String A new event ID specified by the resident
resident homeserver
``origin`` String The name of the assisting resident homeserver ``origin`` String The name of the resident homeserver
``origin_server_ts`` Integer A timestamp added by the resident homeserver ``origin_server_ts`` Integer A timestamp added by the resident homeserver
``prev_events`` List An event-reference list containing the immediate ``prev_events`` List An event-reference list containing the immediate
predecessor events predecessor events
@ -665,12 +665,12 @@ algorithm to it, resulting in the addition of the ``hashes`` and ``signatures``
fields. fields.
To complete the join handshake, the joining server must now submit this new To complete the join handshake, the joining server must now submit this new
event to an assisting resident, by using the ``send_join`` endpoint. This is event to an resident homeserver, by using the ``send_join`` endpoint. This is
invoked using the room ID and the event ID of the new member event. invoked using the room ID and the event ID of the new member event.
The assisting resident then accepts this event into the room's event graph, and The resident homeserver then accepts this event into the room's event graph,
responds to the joining server with the full set of state for the newly-joined and responds to the joining server with the full set of state for the newly-
room. This is returned as a two-element list, whose first element is the joined room. This is returned as a two-element list, whose first element is the
integer 200, and whose second element contains the following keys: integer 200, and whose second element contains the following keys:
============== ===== ============ ============== ===== ============
@ -919,6 +919,6 @@ Querying directory information::
The list of join candidates is a list of server names that are likely to hold The list of join candidates is a list of server names that are likely to hold
the given room; these are servers that the requesting server may wish to use as the given room; these are servers that the requesting server may wish to use as
assisting resident servers as part of the remote join handshake. This list may resident servers as part of the remote join handshake. This list may or may not
or may not include the server answering the query. include the server answering the query.