From 6d0def8b4c19faf2e398f6465037455e1f83e55b Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 24 Nov 2018 12:50:40 +0900
Subject: [PATCH 1/2] Spec lazy_load_members and include_redundant_members

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
---
 .../definitions/sync_filter.yaml              | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/api/client-server/definitions/sync_filter.yaml b/api/client-server/definitions/sync_filter.yaml
index 33bead2625..65b18ba6f2 100644
--- a/api/client-server/definitions/sync_filter.yaml
+++ b/api/client-server/definitions/sync_filter.yaml
@@ -68,9 +68,38 @@ properties:
         description: Include rooms that the user has left in the sync, default false
         type: boolean
       state:
+        type: object
+        title: StateFilter
         allOf:
         - $ref: room_event_filter.yaml
         description: The state events to include for rooms.
+        properties:
+          lazy_load_members:
+            type: boolean
+            description: |-
+              If ``true``, the only ``m.room.member`` events returned in
+              the ``state`` section of the ``/sync`` response are those
+              which are definitely necessary for a client to display
+              the ``sender`` of the timeline events in that response.
+              If ``false``, ``m.room.member`` events are not filtered.
+              By default, servers should suppress duplicate redundant
+              lazy-loaded ``m.room.member`` events from being sent to a given
+              client across multiple calls to ``/sync``, given that most clients
+              cache membership events (see ``include_redundant_members``
+              to change this behaviour).
+          include_redundant_members:
+            type: boolean
+            description: |-
+              If ``true``, the ``state`` section of the ``/sync`` response will
+              always contain the ``m.room.member`` events required to display
+              the ``sender`` of the timeline events in that response, assuming
+              ``lazy_load_members`` is enabled. This means that redundant
+              duplicate member events may be returned across multiple calls to
+              ``/sync``. This is useful for naive clients who never track
+              membership data. If ``false``, duplicate ``m.room.member`` events
+              may be suppressed by the server across multiple calls to ``/sync``.
+              If ``lazy_load_members`` is ``false`` this field is ignored.
+
       timeline:
         allOf:
         - $ref: room_event_filter.yaml

From 8c80669d7aa5a15420424a9f7a94b216ebcb6d7c Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 23 Dec 2018 18:58:44 +0900
Subject: [PATCH 2/2] Add the paragraph for sync.yaml forgotten in the previous
 commit

---
 api/client-server/sync.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/api/client-server/sync.yaml b/api/client-server/sync.yaml
index bb514bbeb2..f204152a08 100644
--- a/api/client-server/sync.yaml
+++ b/api/client-server/sync.yaml
@@ -134,6 +134,12 @@ paths:
                             ``timeline`` (or all state up to the start of the
                             ``timeline``, if ``since`` is not given, or
                             ``full_state`` is true).
+
+                            N.B. state updates for ``m.room.member`` events will
+                            be incomplete if ``lazy_load_members`` is enabled in
+                            the ``/sync`` filter, and only return the member events
+                            required to display the senders of the timeline events
+                            in this response.
                           allOf:
                             - $ref: "definitions/state_event_batch.yaml"
                         timeline: