Merge branch 'upstream' (v0.5.2)

6 files changed, 79 insertions, 28 deletions

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/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index f1482ee4..0783f11b 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -6,19 +6,15 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const HomeserverInformation& pod)
+void JsonObjectConverter<HomeserverInformation>::dumpTo(
+        QJsonObject& jo, const HomeserverInformation& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-    return jo;
 }
 
-HomeserverInformation FromJsonObject<HomeserverInformation>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<HomeserverInformation>::fillFrom(
+    const QJsonObject& jo, HomeserverInformation& result)
 {
-    HomeserverInformation result;
-    result.baseUrl =
-        fromJson<QString>(jo.value("base_url"_ls));
-
-    return result;
+    fromJson(jo.value("base_url"_ls), result.baseUrl);
 }
 
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index 09d6ba63..f6761c30 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -17,12 +17,10 @@ namespace QMatrixClient
         /// The base URL for the homeserver for client-server connections.
         QString baseUrl;
     };
-
-    QJsonObject toJson(const HomeserverInformation& pod);
-
-    template <> struct FromJsonObject<HomeserverInformation>
+    template <> struct JsonObjectConverter<HomeserverInformation>
     {
-        HomeserverInformation operator()(const QJsonObject& jo) const;
+        static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod);
+        static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
     };
 
 } // namespace QMatrixClient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index f9d7bc37..99f36641 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -6,19 +6,15 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const IdentityServerInformation& pod)
+void JsonObjectConverter<IdentityServerInformation>::dumpTo(
+        QJsonObject& jo, const IdentityServerInformation& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-    return jo;
 }
 
-IdentityServerInformation FromJsonObject<IdentityServerInformation>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<IdentityServerInformation>::fillFrom(
+    const QJsonObject& jo, IdentityServerInformation& result)
 {
-    IdentityServerInformation result;
-    result.baseUrl =
-        fromJson<QString>(jo.value("base_url"_ls));
-
-    return result;
+    fromJson(jo.value("base_url"_ls), result.baseUrl);
 }
 
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index cb8ffcee..67d8b08d 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -17,12 +17,10 @@ namespace QMatrixClient
         /// The base URL for the identity server for client-server connections.
         QString baseUrl;
     };
-
-    QJsonObject toJson(const IdentityServerInformation& pod);
-
-    template <> struct FromJsonObject<IdentityServerInformation>
+    template <> struct JsonObjectConverter<IdentityServerInformation>
     {
-        IdentityServerInformation operator()(const QJsonObject& jo) const;
+        static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
+        static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
     };
 
 } // namespace QMatrixClient