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

18 files changed, 28 insertions, 28 deletions

diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index 9b021e17..11385dff 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -80,7 +80,7 @@ namespace QMatrixClient
 
 static const auto Post3PIDsJobName = QStringLiteral("Post3PIDsJob");
 
-Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind)
+Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, Omittable<bool> bind)
     : BaseJob(HttpVerb::Post, Post3PIDsJobName,
         basePath % "/account/3pid")
 {
diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
index 3fb3d44c..02aeee4d 100644
--- a/lib/csapi/administrative_contact.h
+++ b/lib/csapi/administrative_contact.h
@@ -113,7 +113,7 @@ namespace QMatrixClient
              *   identifier to the account's Matrix ID with the passed identity
              *   server. Default: ``false``.
              */
-            explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind = false);
+            explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, Omittable<bool> bind = none);
     };
 
     /// Deletes a third party identifier from the user's account
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index c44b73ac..448547ae 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -45,7 +45,7 @@ class CreateRoomJob::Private
 
 static const auto CreateRoomJobName = QStringLiteral("CreateRoomJob");
 
-CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector<Invite3pid>& invite3pid, const QString& roomVersion, const QJsonObject& creationContent, const QVector<StateEvent>& initialState, const QString& preset, bool isDirect, const QJsonObject& powerLevelContentOverride)
+CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector<Invite3pid>& invite3pid, const QString& roomVersion, const QJsonObject& creationContent, const QVector<StateEvent>& initialState, const QString& preset, Omittable<bool> isDirect, const QJsonObject& powerLevelContentOverride)
     : BaseJob(HttpVerb::Post, CreateRoomJobName,
         basePath % "/createRoom")
     , d(new Private)
diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
index a0a64df0..d7c01d00 100644
--- a/lib/csapi/create_room.h
+++ b/lib/csapi/create_room.h
@@ -216,7 +216,7 @@ namespace QMatrixClient
              *   event content prior to it being sent to the room. Defaults to
              *   overriding nothing.
              */
-            explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector<Invite3pid>& invite3pid = {}, const QString& roomVersion = {}, const QJsonObject& creationContent = {}, const QVector<StateEvent>& initialState = {}, const QString& preset = {}, bool isDirect = false, const QJsonObject& powerLevelContentOverride = {});
+            explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector<Invite3pid>& invite3pid = {}, const QString& roomVersion = {}, const QJsonObject& creationContent = {}, const QVector<StateEvent>& initialState = {}, const QString& preset = {}, Omittable<bool> isDirect = none, const QJsonObject& powerLevelContentOverride = {});
             ~CreateRoomJob() override;
 
             // Result properties
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.
diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index ca4a0fb9..c6ea8a13 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -38,7 +38,7 @@ analyzer:
     - number:
       - float: float
       - //: double
-  - boolean: { type: bool, omittedValue: 'false' }
+    - boolean: bool
   - string:
     - byte: &ByteStream
         type: QIODevice*
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index 137afbfc..52c8ea42 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -59,7 +59,7 @@ namespace QMatrixClient
 
             // Result properties
 
-            /// The joined room id
+            /// The joined room ID.
             const QString& roomId() const;
 
         protected:
@@ -138,7 +138,7 @@ namespace QMatrixClient
 
             // Result properties
 
-            /// The joined room id
+            /// The joined room ID.
             const QString& roomId() const;
 
         protected:
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 2a0cb0ff..71b3c541 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -132,7 +132,7 @@ BaseJob::Query queryToQueryPublicRooms(const QString& server)
 
 static const auto QueryPublicRoomsJobName = QStringLiteral("QueryPublicRoomsJob");
 
-QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, Omittable<int> limit, const QString& since, const Omittable<Filter>& filter, bool includeAllNetworks, const QString& thirdPartyInstanceId)
+QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, Omittable<int> limit, const QString& since, const Omittable<Filter>& filter, Omittable<bool> includeAllNetworks, const QString& thirdPartyInstanceId)
     : BaseJob(HttpVerb::Post, QueryPublicRoomsJobName,
         basePath % "/publicRooms",
         queryToQueryPublicRooms(server))
diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index 8401c134..a6498745 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -156,7 +156,7 @@ namespace QMatrixClient
              *   The specific third party network/protocol to request from the
              *   homeserver. Can only be used if ``include_all_networks`` is false.
              */
-            explicit QueryPublicRoomsJob(const QString& server = {}, Omittable<int> limit = none, const QString& since = {}, const Omittable<Filter>& filter = none, bool includeAllNetworks = false, const QString& thirdPartyInstanceId = {});
+            explicit QueryPublicRoomsJob(const QString& server = {}, Omittable<int> limit = none, const QString& since = {}, const Omittable<Filter>& filter = none, Omittable<bool> includeAllNetworks = none, const QString& thirdPartyInstanceId = {});
             ~QueryPublicRoomsJob() override;
 
             // Result properties
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 94a3e6c5..8a5510b8 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -30,7 +30,7 @@ class GetPresenceJob::Private
         QString presence;
         Omittable<int> lastActiveAgo;
         QString statusMsg;
-        bool currentlyActive;
+        Omittable<bool> currentlyActive;
 };
 
 QUrl GetPresenceJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
@@ -65,7 +65,7 @@ const QString& GetPresenceJob::statusMsg() const
     return d->statusMsg;
 }
 
-bool GetPresenceJob::currentlyActive() const
+Omittable<bool> GetPresenceJob::currentlyActive() const
 {
     return d->currentlyActive;
 }
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index 86b9d395..c8f80357 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -65,7 +65,7 @@ namespace QMatrixClient
             /// The state message for this user if one was set.
             const QString& statusMsg() const;
             /// Whether the user is currently active
-            bool currentlyActive() const;
+            Omittable<bool> currentlyActive() const;
 
         protected:
             Status parseJson(const QJsonDocument& data) override;
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 3ad0dcbe..664959f4 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -92,7 +92,7 @@ namespace QMatrixClient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
-PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append)
+PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, Omittable<bool> append)
     : BaseJob(HttpVerb::Post, PostPusherJobName,
         basePath % "/pushers/set")
 {
diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h
index 2b506183..da3303fe 100644
--- a/lib/csapi/pusher.h
+++ b/lib/csapi/pusher.h
@@ -164,6 +164,6 @@ namespace QMatrixClient
              *   other pushers with the same App ID and pushkey for different
              *   users. The default is ``false``.
              */
-            explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, bool append = false);
+            explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, Omittable<bool> append = none);
     };
 } // namespace QMatrixClient
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 2772cd57..5dc9c1e5 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -30,7 +30,7 @@ BaseJob::Query queryToRegister(const QString& kind)
 
 static const auto RegisterJobName = QStringLiteral("RegisterJob");
 
-RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData>& auth, bool bindEmail, const QString& username, const QString& password, const QString& deviceId, const QString& initialDeviceDisplayName, bool inhibitLogin)
+RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData>& auth, Omittable<bool> bindEmail, const QString& username, const QString& password, const QString& deviceId, const QString& initialDeviceDisplayName, Omittable<bool> inhibitLogin)
     : BaseJob(HttpVerb::Post, RegisterJobName,
         basePath % "/register",
         queryToRegister(kind),
@@ -251,7 +251,7 @@ DeactivateAccountJob::DeactivateAccountJob(const Omittable<AuthenticationData>&
 class CheckUsernameAvailabilityJob::Private
 {
     public:
-        bool available;
+        Omittable<bool> available;
 };
 
 BaseJob::Query queryToCheckUsernameAvailability(const QString& username)
@@ -281,7 +281,7 @@ CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(const QString& userna
 
 CheckUsernameAvailabilityJob::~CheckUsernameAvailabilityJob() = default;
 
-bool CheckUsernameAvailabilityJob::available() const
+Omittable<bool> CheckUsernameAvailabilityJob::available() const
 {
     return d->available;
 }
diff --git a/lib/csapi/registration.h b/lib/csapi/registration.h
index 9002b5c8..ca1a1c21 100644
--- a/lib/csapi/registration.h
+++ b/lib/csapi/registration.h
@@ -80,7 +80,7 @@ namespace QMatrixClient
              *   returned from this call, therefore preventing an automatic
              *   login. Defaults to false.
              */
-            explicit RegisterJob(const QString& kind = QStringLiteral("user"), const Omittable<AuthenticationData>& auth = none, bool bindEmail = false, const QString& username = {}, const QString& password = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}, bool inhibitLogin = false);
+            explicit RegisterJob(const QString& kind = QStringLiteral("user"), const Omittable<AuthenticationData>& auth = none, Omittable<bool> bindEmail = none, const QString& username = {}, const QString& password = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}, Omittable<bool> inhibitLogin = none);
             ~RegisterJob() override;
 
             // Result properties
@@ -418,7 +418,7 @@ namespace QMatrixClient
 
             /// A flag to indicate that the username is available. This should always
             /// be ``true`` when the server replies with 200 OK.
-            bool available() const;
+            Omittable<bool> available() const;
 
         protected:
             Status parseJson(const QJsonDocument& data) override;
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index 85b0886b..86a0ee92 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -39,7 +39,7 @@ namespace QMatrixClient
                 /// historic profile information for the users
                 /// that sent the events that were returned.
                 /// By default, this is ``false``.
-                bool includeProfile;
+                Omittable<bool> includeProfile;
             };
 
             /// Configuration for group.
@@ -74,7 +74,7 @@ namespace QMatrixClient
                 Omittable<IncludeEventContext> eventContext;
                 /// Requests the server return the current state for
                 /// each room returned.
-                bool includeState;
+                Omittable<bool> includeState;
                 /// Requests that the server partitions the result set
                 /// based on the provided list of keys.
                 Omittable<Groupings> groupings;