1 files changed, 86 insertions, 70 deletions
diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
index 06a8bf0d..da50c8c1 100644
--- a/lib/csapi/capabilities.h
+++ b/lib/csapi/capabilities.h
@@ -6,77 +6,93 @@
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QJsonObject>
-#include "converters.h"
-#include <QtCore/QHash>
+namespace Quotient {
 
-namespace QMatrixClient
-{
-    // Operations
+/*! \brief 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 defaultVersion;
+        /// A detailed description of the room versions the server supports.
+        QHash<QString, QString> available;
+    };
+
+    /// The custom capabilities the server supports, using the
+    /// Java package naming convention.
+    struct Capabilities {
+        /// Capability to indicate if the user can change their password.
+        Omittable<ChangePasswordCapability> changePassword;
+        /// The room versions the server supports.
+        Omittable<RoomVersionsCapability> roomVersions;
+        /// The custom capabilities the server supports, using the
+        /// Java package naming convention.
+        QHash<QString, QJsonObject> additionalProperties;
+    };
+
+    // Construction/destruction
 
     /// Gets information about the server's capabilities.
-    ///
-    /// Gets information about the server's supported feature set
-    /// and other relevant capabilities.
-    class GetCapabilitiesJob : public BaseJob
+    explicit GetCapabilitiesJob();
+
+    /*! \brief 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);
+
+    // Result properties
+
+    /// The custom capabilities the server supports, using the
+    /// Java package naming convention.
+    Capabilities capabilities() const
     {
-        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 defaultVersion;
-                /// A detailed description of the room versions the server supports.
-                QHash<QString, QString> available;
-            };
-
-            /// The custom capabilities the server supports, using the
-            /// Java package naming convention.
-            struct Capabilities
-            {
-                /// Capability to indicate if the user can change their password.
-                Omittable<ChangePasswordCapability> changePassword;
-                /// The room versions the server supports.
-                Omittable<RoomVersionsCapability> roomVersions;
-                /// The custom capabilities the server supports, using the
-                /// Java package naming convention.
-                QHash<QString, QJsonObject> additionalProperties;
-            };
-
-            // 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
-
-            /// The custom capabilities the server supports, using the
-            /// Java package naming convention.
-            const Capabilities& capabilities() const;
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
-} // namespace QMatrixClient
+        return loadFromJson<Capabilities>("capabilities"_ls);
+    }
+};
+
+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.defaultVersion);
+        fromJson(jo.value("available"_ls), result.available);
+    }
+};
+
+template <>
+struct JsonObjectConverter<GetCapabilitiesJob::Capabilities> {
+    static void fillFrom(QJsonObject jo,
+                         GetCapabilitiesJob::Capabilities& result)
+    {
+        fromJson(jo.take("m.change_password"_ls), result.changePassword);
+        fromJson(jo.take("m.room_versions"_ls), result.roomVersions);
+        fromJson(jo, result.additionalProperties);
+    }
+};
+
+} // namespace Quotient