Merge branch 'kitsune-omittable-bool' into kitsune-lazy-loading

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index 05328b8b..bea13e96 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -7,10 +7,10 @@
 #include "converters.h"
 
 #include "csapi/definitions/push_condition.h"
-#include "converters.h"
+#include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 #include <QtCore/QVariant>
-#include <QtCore/QJsonObject>
+#include "converters.h"
 
 namespace QMatrixClient
 {
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 3908b8ec..6eb9a390 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -19,8 +19,8 @@ namespace QMatrixClient
         QStringList notRooms;
         /// A list of room IDs to include. If this list is absent then all rooms are included.
         QStringList rooms;
-        /// If ``true``, includes only events with a ``url`` key in their content. If ``false``, excludes those events. Defaults to ``false``.
-        bool containsUrl;
+        /// If ``true``, includes only events with a ``url`` key in their content. If ``false``, excludes those events. If omitted, ``url`` key is not considered for filtering.
+        Omittable<bool> containsUrl;
     };
     template <> struct JsonObjectConverter<RoomEventFilter>
     {
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index ccc3061b..d94c74d7 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -27,7 +27,7 @@ namespace QMatrixClient
         /// client across multiple calls to ``/sync``, given that most clients
         /// cache membership events (see ``include_redundant_members``
         /// to change this behaviour).
-        bool lazyLoadMembers;
+        Omittable<bool> lazyLoadMembers;
         /// 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
@@ -37,7 +37,7 @@ namespace QMatrixClient
         /// 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.
-        bool includeRedundantMembers;
+        Omittable<bool> includeRedundantMembers;
     };
     template <> struct JsonObjectConverter<StateFilter>
     {
@@ -55,7 +55,7 @@ namespace QMatrixClient
         /// The events that aren't recorded in the room history, e.g. typing and receipts, to include for rooms.
         Omittable<RoomEventFilter> ephemeral;
         /// Include rooms that the user has left in the sync, default false
-        bool includeLeave;
+        Omittable<bool> includeLeave;
         /// The state events to include for rooms.
         Omittable<StateFilter> state;
         /// The message and state update events to include for rooms.