From 5d40af7ecff9f862fddb79ec2243e1b4167f1795 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 29 Aug 2018 13:24:02 +0100 Subject: [PATCH 1/3] Update rules on which events to add to `auth_events` --- specification/server_server_api.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 9440f2f2..a2a2274d 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -299,8 +299,15 @@ following subset of the room state: - The ``m.room.create`` event. - The current ``m.room.power_levels`` event, if any. -- The current ``m.room.join_rules`` event, if any. - The sender's current ``m.room.member`` event, if any. +- If type is ``m.room.member``: + + - The target's current ``m.room.member`` event, if any. + - If ``join`` or ``invite`` then the current ``m.room.join_rules`` event, + if any. + - If ``invite`` with ``third_party_invite`` in ``content``, then add + ``m.room.third_party_invite`` with state_key of ``token`` in ``signed`` + field of ``third_party_invite``, if any. {{definition_ss_pdu}} From 1a45bc4a8591365fd0ab8616d0194a49e21a4913 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 31 Aug 2018 10:24:51 +0100 Subject: [PATCH 2/3] Reword --- specification/server_server_api.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index a2a2274d..29d104d9 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -303,11 +303,12 @@ following subset of the room state: - If type is ``m.room.member``: - The target's current ``m.room.member`` event, if any. - - If ``join`` or ``invite`` then the current ``m.room.join_rules`` event, - if any. - - If ``invite`` with ``third_party_invite`` in ``content``, then add - ``m.room.third_party_invite`` with state_key of ``token`` in ``signed`` - field of ``third_party_invite``, if any. + - If membership is ``join`` or ``invite``, the current ``m.room.join_rules`` + event, if any. + - If membership is ``invite`` and ``content`` contains a + ``third_party_invite`` property, the current + ``m.room.third_party_invite`` with state_key matching + ``content.third_party_invite.signed.token``, if any. {{definition_ss_pdu}} From d91dc6fbf628dc2e021abb5cc89d92cd6b3a2c89 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 31 Aug 2018 11:20:26 +0100 Subject: [PATCH 3/3] Fixup --- 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 29d104d9..727ac493 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -303,11 +303,11 @@ following subset of the room state: - If type is ``m.room.member``: - The target's current ``m.room.member`` event, if any. - - If membership is ``join`` or ``invite``, the current ``m.room.join_rules`` - event, if any. + - If ``membership`` is ``join`` or ``invite``, the current + ``m.room.join_rules`` event, if any. - If membership is ``invite`` and ``content`` contains a ``third_party_invite`` property, the current - ``m.room.third_party_invite`` with state_key matching + ``m.room.third_party_invite`` event with ``state_key`` matching ``content.third_party_invite.signed.token``, if any. {{definition_ss_pdu}}