Merge branch 'kitsune-update-matrix-api'

18 files changed, 433 insertions, 120 deletions

diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
new file mode 100644
index 00000000..a8e79f6b
--- /dev/null
+++ b/lib/csapi/capabilities.cpp
@@ -0,0 +1,78 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "capabilities.h"
+
+#include "converters.h"
+
+#include <QtCore/QStringBuilder>
+
+using namespace QMatrixClient;
+
+static const auto basePath = QStringLiteral("/_matrix/client/r0");
+
+namespace QMatrixClient
+{
+    // Converters
+
+    template <> struct JsonObjectConverter<GetCapabilitiesJob::ChangePasswordCapability>
+    {
+        static void fillFrom(const QJsonObject& jo, GetCapabilitiesJob::ChangePasswordCapability& result)
+        {
+            fromJson(jo.value("enabled"_ls), result.enabled);
+        }
+    };
+
+    template <> struct JsonObjectConverter<GetCapabilitiesJob::RoomVersionsCapability>
+    {
+        static void fillFrom(const QJsonObject& jo, GetCapabilitiesJob::RoomVersionsCapability& result)
+        {
+            fromJson(jo.value("default"_ls), result.isDefault);
+            fromJson(jo.value("available"_ls), result.available);
+        }
+    };
+} // namespace QMatrixClient
+
+class GetCapabilitiesJob::Private
+{
+    public:
+        Omittable<ChangePasswordCapability> changePassword;
+        Omittable<RoomVersionsCapability> roomVersions;
+};
+
+QUrl GetCapabilitiesJob::makeRequestUrl(QUrl baseUrl)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+            basePath % "/capabilities");
+}
+
+static const auto GetCapabilitiesJobName = QStringLiteral("GetCapabilitiesJob");
+
+GetCapabilitiesJob::GetCapabilitiesJob()
+    : BaseJob(HttpVerb::Get, GetCapabilitiesJobName,
+        basePath % "/capabilities")
+    , d(new Private)
+{
+}
+
+GetCapabilitiesJob::~GetCapabilitiesJob() = default;
+
+const Omittable<GetCapabilitiesJob::ChangePasswordCapability>& GetCapabilitiesJob::changePassword() const
+{
+    return d->changePassword;
+}
+
+const Omittable<GetCapabilitiesJob::RoomVersionsCapability>& GetCapabilitiesJob::roomVersions() const
+{
+    return d->roomVersions;
+}
+
+BaseJob::Status GetCapabilitiesJob::parseJson(const QJsonDocument& data)
+{
+    auto json = data.object();
+    fromJson(json.value("m.change_password"_ls), d->changePassword);
+    fromJson(json.value("m.room_versions"_ls), d->roomVersions);
+    return Success;
+}
+
diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
new file mode 100644
index 00000000..e38483bc
--- /dev/null
+++ b/lib/csapi/capabilities.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "jobs/basejob.h"
+
+#include "converters.h"
+#include <QtCore/QHash>
+
+namespace QMatrixClient
+{
+    // Operations
+
+    /// Gets information about the server's capabilities.
+    ///
+    /// Gets information about the server's supported feature set
+    /// and other relevant capabilities.
+    class GetCapabilitiesJob : public BaseJob
+    {
+        public:
+            // Inner data structures
+
+            /// Capability to indicate if the user can change their password.
+            struct ChangePasswordCapability
+            {
+                /// True if the user can change their password, false otherwise.
+                bool enabled;
+            };
+
+            /// The room versions the server supports.
+            struct RoomVersionsCapability
+            {
+                /// The default room version the server is using for new rooms.
+                QString isDefault;
+                /// A detailed description of the room versions the server supports.
+                QHash<QString, QString> available;
+            };
+
+            // Construction/destruction
+
+            explicit GetCapabilitiesJob();
+
+            /*! Construct a URL without creating a full-fledged job object
+             *
+             * This function can be used when a URL for
+             * GetCapabilitiesJob is necessary but the job
+             * itself isn't.
+             */
+            static QUrl makeRequestUrl(QUrl baseUrl);
+
+            ~GetCapabilitiesJob() override;
+
+            // Result properties
+
+            /// Capability to indicate if the user can change their password.
+            const Omittable<ChangePasswordCapability>& changePassword() const;
+            /// The room versions the server supports.
+            const Omittable<RoomVersionsCapability>& roomVersions() const;
+
+        protected:
+            Status parseJson(const QJsonDocument& data) override;
+
+        private:
+            class Private;
+            QScopedPointer<Private> d;
+    };
+} // namespace QMatrixClient
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
new file mode 100644
index 00000000..5ecef34f
--- /dev/null
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -0,0 +1,25 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "full.h"
+
+using namespace QMatrixClient;
+
+void JsonObjectConverter<DiscoveryInformation>::dumpTo(
+        QJsonObject& jo, const DiscoveryInformation& pod)
+{
+    fillJson(jo, pod.additionalProperties);
+    addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
+    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"), pod.identityServer);
+}
+
+void JsonObjectConverter<DiscoveryInformation>::fillFrom(
+    QJsonObject jo, DiscoveryInformation& result)
+{
+    fromJson(jo.take("m.homeserver"_ls), result.homeserver);
+    fromJson(jo.take("m.identity_server"_ls), result.identityServer);
+
+    fromJson(jo, result.additionalProperties);
+}
+
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
new file mode 100644
index 00000000..d9346acb
--- /dev/null
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "converters.h"
+
+#include <QtCore/QJsonObject>
+#include "converters.h"
+#include "csapi/definitions/wellknown/homeserver.h"
+#include "csapi/definitions/wellknown/identity_server.h"
+#include <QtCore/QHash>
+
+namespace QMatrixClient
+{
+    // Data structures
+
+    /// Used by clients to determine the homeserver, identity server, and other
+    /// optional components they should be interacting with.
+    struct DiscoveryInformation
+    {
+        /// Used by clients to determine the homeserver, identity server, and other
+        /// optional components they should be interacting with.
+        HomeserverInformation homeserver;
+        /// Used by clients to determine the homeserver, identity server, and other
+        /// optional components they should be interacting with.
+        Omittable<IdentityServerInformation> identityServer;
+        /// Application-dependent keys using Java package naming convention.
+        QHash<QString, QJsonObject> additionalProperties;
+    };
+    template <> struct JsonObjectConverter<DiscoveryInformation>
+    {
+        static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
+        static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
+    };
+
+} // namespace QMatrixClient
diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index c6ea8a13..21a59a5c 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -11,6 +11,8 @@ analyzer:
     m.upload.size: uploadSize
     m.homeserver: homeserver
     m.identity_server: identityServer
+    m.change_password: changePassword
+    m.room_versions: roomVersions
     AuthenticationData/additionalProperties: authInfo
 
   # Structure inside `types`:
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index ee33dac2..5e369b9a 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -67,6 +67,7 @@ class LoginJob::Private
         QString accessToken;
         QString homeServer;
         QString deviceId;
+        Omittable<DiscoveryInformation> wellKnown;
 };
 
 static const auto LoginJobName = QStringLiteral("LoginJob");
@@ -111,6 +112,11 @@ const QString& LoginJob::deviceId() const
     return d->deviceId;
 }
 
+const Omittable<DiscoveryInformation>& LoginJob::wellKnown() const
+{
+    return d->wellKnown;
+}
+
 BaseJob::Status LoginJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
@@ -118,6 +124,7 @@ BaseJob::Status LoginJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("access_token"_ls), d->accessToken);
     fromJson(json.value("home_server"_ls), d->homeServer);
     fromJson(json.value("device_id"_ls), d->deviceId);
+    fromJson(json.value("well_known"_ls), d->wellKnown);
     return Success;
 }
 
diff --git a/lib/csapi/login.h b/lib/csapi/login.h
index 957d8881..648316df 100644
--- a/lib/csapi/login.h
+++ b/lib/csapi/login.h
@@ -7,6 +7,7 @@
 #include "jobs/basejob.h"
 
 #include <QtCore/QVector>
+#include "csapi/definitions/wellknown/full.h"
 #include "csapi/definitions/user_identifier.h"
 #include "converters.h"
 
@@ -118,6 +119,11 @@ namespace QMatrixClient
             /// ID of the logged-in device. Will be the same as the
             /// corresponding parameter in the request, if one was specified.
             const QString& deviceId() const;
+            /// Optional client configuration provided by the server. If present,
+            /// clients SHOULD use the provided object to reconfigure themselves,
+            /// optionally validating the URLs within. This object takes the same
+            /// form as the one returned from .well-known autodiscovery.
+            const Omittable<DiscoveryInformation>& wellKnown() const;
 
         protected:
             Status parseJson(const QJsonDocument& data) override;
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index 8a5510b8..024d7a34 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -83,49 +83,3 @@ BaseJob::Status GetPresenceJob::parseJson(const QJsonDocument& data)
     return Success;
 }
 
-static const auto ModifyPresenceListJobName = QStringLiteral("ModifyPresenceListJob");
-
-ModifyPresenceListJob::ModifyPresenceListJob(const QString& userId, const QStringList& invite, const QStringList& drop)
-    : BaseJob(HttpVerb::Post, ModifyPresenceListJobName,
-        basePath % "/presence/list/" % userId)
-{
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("invite"), invite);
-    addParam<IfNotEmpty>(_data, QStringLiteral("drop"), drop);
-    setRequestData(_data);
-}
-
-class GetPresenceForListJob::Private
-{
-    public:
-        Events data;
-};
-
-QUrl GetPresenceForListJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
-{
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/presence/list/" % userId);
-}
-
-static const auto GetPresenceForListJobName = QStringLiteral("GetPresenceForListJob");
-
-GetPresenceForListJob::GetPresenceForListJob(const QString& userId)
-    : BaseJob(HttpVerb::Get, GetPresenceForListJobName,
-        basePath % "/presence/list/" % userId, false)
-    , d(new Private)
-{
-}
-
-GetPresenceForListJob::~GetPresenceForListJob() = default;
-
-Events&& GetPresenceForListJob::data()
-{
-    return std::move(d->data);
-}
-
-BaseJob::Status GetPresenceForListJob::parseJson(const QJsonDocument& data)
-{
-    fromJson(data, d->data);
-    return Success;
-}
-
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index c8f80357..5e132d24 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -6,7 +6,6 @@
 
 #include "jobs/basejob.h"
 
-#include "events/eventloader.h"
 #include "converters.h"
 
 namespace QMatrixClient
@@ -74,56 +73,4 @@ namespace QMatrixClient
             class Private;
             QScopedPointer<Private> d;
     };
-
-    /// Add or remove users from this presence list.
-    ///
-    /// Adds or removes users from this presence list.
-    class ModifyPresenceListJob : public BaseJob
-    {
-        public:
-            /*! Add or remove users from this presence list.
-             * \param userId
-             *   The user whose presence list is being modified.
-             * \param invite
-             *   A list of user IDs to add to the list.
-             * \param drop
-             *   A list of user IDs to remove from the list.
-             */
-            explicit ModifyPresenceListJob(const QString& userId, const QStringList& invite = {}, const QStringList& drop = {});
-    };
-
-    /// Get presence events for this presence list.
-    ///
-    /// Retrieve a list of presence events for every user on this list.
-    class GetPresenceForListJob : public BaseJob
-    {
-        public:
-            /*! Get presence events for this presence list.
-             * \param userId
-             *   The user whose presence list should be retrieved.
-             */
-            explicit GetPresenceForListJob(const QString& userId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPresenceForListJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
-
-            ~GetPresenceForListJob() override;
-
-            // Result properties
-
-            /// A list of presence events for this list.
-            Events&& data();
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
 } // namespace QMatrixClient
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
new file mode 100644
index 00000000..f58fd675
--- /dev/null
+++ b/lib/csapi/room_upgrades.cpp
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "room_upgrades.h"
+
+#include "converters.h"
+
+#include <QtCore/QStringBuilder>
+
+using namespace QMatrixClient;
+
+static const auto basePath = QStringLiteral("/_matrix/client/r0");
+
+class UpgradeRoomJob::Private
+{
+    public:
+        QString replacementRoom;
+};
+
+static const auto UpgradeRoomJobName = QStringLiteral("UpgradeRoomJob");
+
+UpgradeRoomJob::UpgradeRoomJob(const QString& roomId, const QString& newVersion)
+    : BaseJob(HttpVerb::Post, UpgradeRoomJobName,
+        basePath % "/rooms/" % roomId % "/upgrade")
+    , d(new Private)
+{
+    QJsonObject _data;
+    addParam<>(_data, QStringLiteral("new_version"), newVersion);
+    setRequestData(_data);
+}
+
+UpgradeRoomJob::~UpgradeRoomJob() = default;
+
+const QString& UpgradeRoomJob::replacementRoom() const
+{
+    return d->replacementRoom;
+}
+
+BaseJob::Status UpgradeRoomJob::parseJson(const QJsonDocument& data)
+{
+    auto json = data.object();
+    if (!json.contains("replacement_room"_ls))
+        return { JsonParseError,
+            "The key 'replacement_room' not found in the response" };
+    fromJson(json.value("replacement_room"_ls), d->replacementRoom);
+    return Success;
+}
+
diff --git a/lib/csapi/room_upgrades.h b/lib/csapi/room_upgrades.h
new file mode 100644
index 00000000..6f712f10
--- /dev/null
+++ b/lib/csapi/room_upgrades.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "jobs/basejob.h"
+
+
+namespace QMatrixClient
+{
+    // Operations
+
+    /// Upgrades a room to a new room version.
+    ///
+    /// Upgrades the given room to a particular room version, migrating as much
+    /// data as possible over to the new room. See the `room_upgrades <#room-upgrades>`_
+    /// module for more information on what this entails.
+    class UpgradeRoomJob : public BaseJob
+    {
+        public:
+            /*! Upgrades a room to a new room version.
+             * \param roomId
+             *   The ID of the room to upgrade.
+             * \param newVersion
+             *   The new version for the room.
+             */
+            explicit UpgradeRoomJob(const QString& roomId, const QString& newVersion);
+            ~UpgradeRoomJob() override;
+
+            // Result properties
+
+            /// The ID of the new room.
+            const QString& replacementRoom() const;
+
+        protected:
+            Status parseJson(const QJsonDocument& data) override;
+
+        private:
+            class Private;
+            QScopedPointer<Private> d;
+    };
+} // namespace QMatrixClient
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
new file mode 100644
index 00000000..7323951c
--- /dev/null
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "sso_login_redirect.h"
+
+#include "converters.h"
+
+#include <QtCore/QStringBuilder>
+
+using namespace QMatrixClient;
+
+static const auto basePath = QStringLiteral("/_matrix/client/r0");
+
+BaseJob::Query queryToRedirectToSSO(const QString& redirectUrl)
+{
+    BaseJob::Query _q;
+    addParam<>(_q, QStringLiteral("redirectUrl"), redirectUrl);
+    return _q;
+}
+
+QUrl RedirectToSSOJob::makeRequestUrl(QUrl baseUrl, const QString& redirectUrl)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+            basePath % "/login/sso/redirect",
+            queryToRedirectToSSO(redirectUrl));
+}
+
+static const auto RedirectToSSOJobName = QStringLiteral("RedirectToSSOJob");
+
+RedirectToSSOJob::RedirectToSSOJob(const QString& redirectUrl)
+    : BaseJob(HttpVerb::Get, RedirectToSSOJobName,
+        basePath % "/login/sso/redirect",
+        queryToRedirectToSSO(redirectUrl),
+        {}, false)
+{
+}
+
diff --git a/lib/csapi/sso_login_redirect.h b/lib/csapi/sso_login_redirect.h
new file mode 100644
index 00000000..c09365b0
--- /dev/null
+++ b/lib/csapi/sso_login_redirect.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "jobs/basejob.h"
+
+
+namespace QMatrixClient
+{
+    // Operations
+
+    /// Redirect the user's browser to the SSO interface.
+    ///
+    /// A web-based Matrix client should instruct the user's browser to
+    /// navigate to this endpoint in order to log in via SSO.
+    /// 
+    /// The server MUST respond with an HTTP redirect to the SSO interface.
+    class RedirectToSSOJob : public BaseJob
+    {
+        public:
+            /*! Redirect the user's browser to the SSO interface.
+             * \param redirectUrl
+             *   URI to which the user will be redirected after the homeserver has
+             *   authenticated the user with SSO.
+             */
+            explicit RedirectToSSOJob(const QString& redirectUrl);
+
+            /*! Construct a URL without creating a full-fledged job object
+             *
+             * This function can be used when a URL for
+             * RedirectToSSOJob is necessary but the job
+             * itself isn't.
+             */
+            static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
+
+    };
+} // namespace QMatrixClient
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index c853ec06..6ee6725d 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -16,6 +16,7 @@ class GetVersionsJob::Private
 {
     public:
         QStringList versions;
+        QHash<QString, bool> unstableFeatures;
 };
 
 QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl)
@@ -40,10 +41,19 @@ const QStringList& GetVersionsJob::versions() const
     return d->versions;
 }
 
+const QHash<QString, bool>& GetVersionsJob::unstableFeatures() const
+{
+    return d->unstableFeatures;
+}
+
 BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
+    if (!json.contains("versions"_ls))
+        return { JsonParseError,
+            "The key 'versions' not found in the response" };
     fromJson(json.value("versions"_ls), d->versions);
+    fromJson(json.value("unstable_features"_ls), d->unstableFeatures);
     return Success;
 }
 
diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h
index 309de184..b56f293f 100644
--- a/lib/csapi/versions.h
+++ b/lib/csapi/versions.h
@@ -6,6 +6,8 @@
 
 #include "jobs/basejob.h"
 
+#include <QtCore/QHash>
+#include "converters.h"
 
 namespace QMatrixClient
 {
@@ -19,6 +21,19 @@ namespace QMatrixClient
     /// 
     /// Only the latest ``Z`` value will be reported for each supported ``X.Y`` value.
     /// i.e. if the server implements ``r0.0.0``, ``r0.0.1``, and ``r1.2.0``, it will report ``r0.0.1`` and ``r1.2.0``.
+    /// 
+    /// The server may additionally advertise experimental features it supports
+    /// through ``unstable_features``. These features should be namespaced and
+    /// may optionally include version information within their name if desired.
+    /// Features listed here are not for optionally toggling parts of the Matrix
+    /// specification and should only be used to advertise support for a feature
+    /// which has not yet landed in the spec. For example, a feature currently
+    /// undergoing the proposal process may appear here and eventually be taken
+    /// off this list once the feature lands in the spec and the server deems it
+    /// reasonable to do so. Servers may wish to keep advertising features here
+    /// after they've been released into the spec to give clients a chance to
+    /// upgrade appropriately. Additionally, clients should avoid using unstable
+    /// features in their stable releases.
     class GetVersionsJob : public BaseJob
     {
         public:
@@ -38,6 +53,10 @@ namespace QMatrixClient
 
             /// The supported versions.
             const QStringList& versions() const;
+            /// Experimental features the server supports. Features not listed here,
+            /// or the lack of this property all together, indicate that a feature is
+            /// not supported.
+            const QHash<QString, bool>& unstableFeatures() const;
 
         protected:
             Status parseJson(const QJsonDocument& data) override;
diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index 97505830..a6107f86 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -15,8 +15,7 @@ static const auto basePath = QStringLiteral("/.well-known");
 class GetWellknownJob::Private
 {
     public:
-        HomeserverInformation homeserver;
-        Omittable<IdentityServerInformation> identityServer;
+        DiscoveryInformation data;
 };
 
 QUrl GetWellknownJob::makeRequestUrl(QUrl baseUrl)
@@ -36,24 +35,14 @@ GetWellknownJob::GetWellknownJob()
 
 GetWellknownJob::~GetWellknownJob() = default;
 
-const HomeserverInformation& GetWellknownJob::homeserver() const
+const DiscoveryInformation& GetWellknownJob::data() const
 {
-    return d->homeserver;
-}
-
-const Omittable<IdentityServerInformation>& GetWellknownJob::identityServer() const
-{
-    return d->identityServer;
+    return d->data;
 }
 
 BaseJob::Status GetWellknownJob::parseJson(const QJsonDocument& data)
 {
-    auto json = data.object();
-    if (!json.contains("m.homeserver"_ls))
-        return { JsonParseError,
-            "The key 'm.homeserver' not found in the response" };
-    fromJson(json.value("m.homeserver"_ls), d->homeserver);
-    fromJson(json.value("m.identity_server"_ls), d->identityServer);
+    fromJson(data, d->data);
     return Success;
 }
 
diff --git a/lib/csapi/wellknown.h b/lib/csapi/wellknown.h
index df4c8c6e..8da9ce9f 100644
--- a/lib/csapi/wellknown.h
+++ b/lib/csapi/wellknown.h
@@ -6,9 +6,8 @@
 
 #include "jobs/basejob.h"
 
+#include "csapi/definitions/wellknown/full.h"
 #include "converters.h"
-#include "csapi/definitions/wellknown/identity_server.h"
-#include "csapi/definitions/wellknown/homeserver.h"
 
 namespace QMatrixClient
 {
@@ -41,10 +40,8 @@ namespace QMatrixClient
 
             // Result properties
 
-            /// Information about the homeserver to connect to.
-            const HomeserverInformation& homeserver() const;
-            /// Optional. Information about the identity server to connect to.
-            const Omittable<IdentityServerInformation>& identityServer() const;
+            /// Server discovery information.
+            const DiscoveryInformation& data() const;
 
         protected:
             Status parseJson(const QJsonDocument& data) override;
diff --git a/lib/util.h b/lib/util.h
index ade6e8c2..420b0984 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -103,6 +103,9 @@ namespace QMatrixClient
             }
             Omittable<T>& operator=(value_type&& val)
             {
+                // For some reason GCC complains about -Wmaybe-uninitialized
+                // in the context of using Omittable<bool> with converters.h;
+                // though the logic looks very much benign (GCC bug???)
                 _value = std::move(val);
                 _omitted = false;
                 return *this;