From 1fb7647021014cb27a39c721bcf9180f12a8894b Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 18 Dec 2017 17:58:35 +0000 Subject: [PATCH 1/2] send_join: clarify auth_chain description The auth_chain field should contain all of the auth events required to auth the state events, as well as those required to auth the join event itself. (cf https://github.com/matrix-org/synapse/blob/e148438/synapse/handlers/federation.py#L1076-L1077). --- specification/server_server_api.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 0770e38e..d97f9d1f 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -941,11 +941,11 @@ following keys: ============== ===== ============ Key Type Description ============== ===== ============ -``auth_chain`` List A list of events giving the authorization chain for this - join event +``auth_chain`` List A list of events giving the all of the events in the auth + chains for the join event and the events in ``state``. ``state`` List A complete list of the prevailing state events at the instant just before accepting the new ``m.room.member`` - event + event. ============== ===== ============ .. TODO-spec From 15ca952cc3898acfa41bf18dbcdf9cfaa8daee2c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 20 Dec 2017 10:10:02 +0000 Subject: [PATCH 2/2] remove spurious word --- specification/server_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index d97f9d1f..43874321 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -941,7 +941,7 @@ following keys: ============== ===== ============ Key Type Description ============== ===== ============ -``auth_chain`` List A list of events giving the all of the events in the auth +``auth_chain`` List A list of events giving all of the events in the auth chains for the join event and the events in ``state``. ``state`` List A complete list of the prevailing state events at the instant just before accepting the new ``m.room.member``