From e7ed8a23ce1e2e4c11484e1ffcda728730c56b22 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 27 May 2019 14:42:00 -0600
Subject: [PATCH] Move lazy loading filter options to event filter

The options also work on /messages
---
 .../definitions/room_event_filter.yaml        | 25 ++++++++++++++++
 .../definitions/sync_filter.yaml              | 29 +------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/api/client-server/definitions/room_event_filter.yaml b/api/client-server/definitions/room_event_filter.yaml
index aa217d2b..fd399913 100644
--- a/api/client-server/definitions/room_event_filter.yaml
+++ b/api/client-server/definitions/room_event_filter.yaml
@@ -16,6 +16,31 @@ allOf:
 - type: object
   title: RoomEventFilter
   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.
     not_rooms:
       description: A list of room IDs to exclude. If this list is absent then no rooms
         are excluded. A matching room will be excluded even if it is listed in the ``'rooms'``
diff --git a/api/client-server/definitions/sync_filter.yaml b/api/client-server/definitions/sync_filter.yaml
index 65b18ba6..45a269c7 100644
--- a/api/client-server/definitions/sync_filter.yaml
+++ b/api/client-server/definitions/sync_filter.yaml
@@ -47,7 +47,7 @@ properties:
       not_rooms:
         description: A list of room IDs to exclude. If this list is absent then no rooms
           are excluded. A matching room will be excluded even if it is listed in the ``'rooms'``
-          filter. This filter is applied before the filters in ``ephemeral``, 
+          filter. This filter is applied before the filters in ``ephemeral``,
           ``state``, ``timeline`` or ``account_data``
         items:
           type: string
@@ -73,33 +73,6 @@ properties:
         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