Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 201 insertions, 158 deletions

diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index a6498745..b0cb79d2 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -4,171 +4,214 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include "csapi/definitions/public_rooms_response.h"
-#include "converters.h"
 
-namespace QMatrixClient
-{
-    // Operations
+#include "jobs/basejob.h"
 
-    /// Gets the visibility of a room in the directory
-    ///
-    /// Gets the visibility of a given room on the server's public room directory.
-    class GetRoomVisibilityOnDirectoryJob : public BaseJob
-    {
-        public:
-            /*! Gets the visibility of a room in the directory
-             * \param roomId
-             *   The room ID.
-             */
-            explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId);
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetRoomVisibilityOnDirectoryJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
-
-            ~GetRoomVisibilityOnDirectoryJob() override;
-
-            // Result properties
-
-            /// The visibility of the room in the directory.
-            const QString& visibility() const;
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
+namespace Quotient {
 
-    /// Sets the visibility of a room in the room directory
-    ///
-    /// Sets the visibility of a given room in the server's public room
-    /// directory.
-    /// 
-    /// Servers may choose to implement additional access control checks
-    /// here, for instance that room visibility can only be changed by 
-    /// the room creator or a server administrator.
-    class SetRoomVisibilityOnDirectoryJob : public BaseJob
+/*! \brief Gets the visibility of a room in the directory
+ *
+ * Gets the visibility of a given room on the server's public room directory.
+ */
+class GetRoomVisibilityOnDirectoryJob : public BaseJob {
+public:
+    /*! \brief Gets the visibility of a room in the directory
+     *
+     * \param roomId
+     *   The room ID.
+     */
+    explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId);
+
+    /*! \brief Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for GetRoomVisibilityOnDirectoryJob
+     * is necessary but the job itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+
+    // Result properties
+
+    /// The visibility of the room in the directory.
+    QString visibility() const
     {
-        public:
-            /*! Sets the visibility of a room in the room directory
-             * \param roomId
-             *   The room ID.
-             * \param visibility
-             *   The new visibility setting for the room. 
-             *   Defaults to 'public'.
-             */
-            explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility = {});
+        return loadFromJson<QString>("visibility"_ls);
+    }
+};
+
+/*! \brief Sets the visibility of a room in the room directory
+ *
+ * Sets the visibility of a given room in the server's public room
+ * directory.
+ *
+ * Servers may choose to implement additional access control checks
+ * here, for instance that room visibility can only be changed by
+ * the room creator or a server administrator.
+ */
+class SetRoomVisibilityOnDirectoryJob : public BaseJob {
+public:
+    /*! \brief Sets the visibility of a room in the room directory
+     *
+     * \param roomId
+     *   The room ID.
+     *
+     * \param visibility
+     *   The new visibility setting for the room.
+     *   Defaults to 'public'.
+     */
+    explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId,
+                                             const QString& visibility = {});
+};
+
+/*! \brief Lists the public rooms on the server.
+ *
+ * Lists the public rooms on the server.
+ *
+ * This API returns paginated responses. The rooms are ordered by the number
+ * of joined members, with the largest rooms first.
+ */
+class GetPublicRoomsJob : public BaseJob {
+public:
+    /*! \brief Lists the public rooms on the server.
+     *
+     * \param limit
+     *   Limit the number of results returned.
+     *
+     * \param since
+     *   A pagination token from a previous request, allowing clients to
+     *   get the next (or previous) batch of rooms.
+     *   The direction of pagination is specified solely by which token
+     *   is supplied, rather than via an explicit flag.
+     *
+     * \param server
+     *   The server to fetch the public room lists from. Defaults to the
+     *   local server.
+     */
+    explicit GetPublicRoomsJob(Omittable<int> limit = none,
+                               const QString& since = {},
+                               const QString& server = {});
+
+    /*! \brief Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for GetPublicRoomsJob
+     * is necessary but the job itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, Omittable<int> limit = none,
+                               const QString& since = {},
+                               const QString& server = {});
+
+    // Result properties
+
+    /// A paginated chunk of public rooms.
+    QVector<PublicRoomsChunk> chunk() const
+    {
+        return loadFromJson<QVector<PublicRoomsChunk>>("chunk"_ls);
+    }
+
+    /// A pagination token for the response. The absence of this token
+    /// means there are no more results to fetch and the client should
+    /// stop paginating.
+    QString nextBatch() const { return loadFromJson<QString>("next_batch"_ls); }
+
+    /// A pagination token that allows fetching previous results. The
+    /// absence of this token means there are no results before this
+    /// batch, i.e. this is the first batch.
+    QString prevBatch() const { return loadFromJson<QString>("prev_batch"_ls); }
+
+    /// An estimate on the total number of public rooms, if the
+    /// server has an estimate.
+    Omittable<int> totalRoomCountEstimate() const
+    {
+        return loadFromJson<Omittable<int>>("total_room_count_estimate"_ls);
+    }
+};
+
+/*! \brief Lists the public rooms on the server with optional filter.
+ *
+ * Lists the public rooms on the server, with optional filter.
+ *
+ * This API returns paginated responses. The rooms are ordered by the number
+ * of joined members, with the largest rooms first.
+ */
+class QueryPublicRoomsJob : public BaseJob {
+public:
+    // Inner data structures
+
+    /// Filter to apply to the results.
+    struct Filter {
+        /// A string to search for in the room metadata, e.g. name,
+        /// topic, canonical alias etc. (Optional).
+        QString genericSearchTerm;
     };
 
-    /// Lists the public rooms on the server.
-    ///
-    /// Lists the public rooms on the server.
-    /// 
-    /// This API returns paginated responses. The rooms are ordered by the number
-    /// of joined members, with the largest rooms first.
-    class GetPublicRoomsJob : public BaseJob
+    // Construction/destruction
+
+    /*! \brief Lists the public rooms on the server with optional filter.
+     *
+     * \param server
+     *   The server to fetch the public room lists from. Defaults to the
+     *   local server.
+     *
+     * \param limit
+     *   Limit the number of results returned.
+     *
+     * \param since
+     *   A pagination token from a previous request, allowing clients
+     *   to get the next (or previous) batch of rooms.  The direction
+     *   of pagination is specified solely by which token is supplied,
+     *   rather than via an explicit flag.
+     *
+     * \param filter
+     *   Filter to apply to the results.
+     *
+     * \param includeAllNetworks
+     *   Whether or not to include all known networks/protocols from
+     *   application services on the homeserver. Defaults to false.
+     *
+     * \param thirdPartyInstanceId
+     *   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,
+                                 Omittable<bool> includeAllNetworks = none,
+                                 const QString& thirdPartyInstanceId = {});
+
+    // Result properties
+
+    /// A paginated chunk of public rooms.
+    QVector<PublicRoomsChunk> chunk() const
     {
-        public:
-            /*! Lists the public rooms on the server.
-             * \param limit
-             *   Limit the number of results returned.
-             * \param since
-             *   A pagination token from a previous request, allowing clients to
-             *   get the next (or previous) batch of rooms.
-             *   The direction of pagination is specified solely by which token
-             *   is supplied, rather than via an explicit flag.
-             * \param server
-             *   The server to fetch the public room lists from. Defaults to the
-             *   local server.
-             */
-            explicit GetPublicRoomsJob(Omittable<int> limit = none, const QString& since = {}, const QString& server = {});
-
-            /*! Construct a URL without creating a full-fledged job object
-             *
-             * This function can be used when a URL for
-             * GetPublicRoomsJob is necessary but the job
-             * itself isn't.
-             */
-            static QUrl makeRequestUrl(QUrl baseUrl, Omittable<int> limit = none, const QString& since = {}, const QString& server = {});
-
-            ~GetPublicRoomsJob() override;
-
-            // Result properties
-
-            /// A list of the rooms on the server.
-            const PublicRoomsResponse& data() const;
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
+        return loadFromJson<QVector<PublicRoomsChunk>>("chunk"_ls);
+    }
+
+    /// A pagination token for the response. The absence of this token
+    /// means there are no more results to fetch and the client should
+    /// stop paginating.
+    QString nextBatch() const { return loadFromJson<QString>("next_batch"_ls); }
+
+    /// A pagination token that allows fetching previous results. The
+    /// absence of this token means there are no results before this
+    /// batch, i.e. this is the first batch.
+    QString prevBatch() const { return loadFromJson<QString>("prev_batch"_ls); }
+
+    /// An estimate on the total number of public rooms, if the
+    /// server has an estimate.
+    Omittable<int> totalRoomCountEstimate() const
+    {
+        return loadFromJson<Omittable<int>>("total_room_count_estimate"_ls);
+    }
+};
 
-    /// Lists the public rooms on the server with optional filter.
-    ///
-    /// Lists the public rooms on the server, with optional filter.
-    /// 
-    /// This API returns paginated responses. The rooms are ordered by the number
-    /// of joined members, with the largest rooms first.
-    class QueryPublicRoomsJob : public BaseJob
+template <>
+struct JsonObjectConverter<QueryPublicRoomsJob::Filter> {
+    static void dumpTo(QJsonObject& jo, const QueryPublicRoomsJob::Filter& pod)
     {
-        public:
-            // Inner data structures
-
-            /// Filter to apply to the results.
-            struct Filter
-            {
-                /// A string to search for in the room metadata, e.g. name,
-                /// topic, canonical alias etc. (Optional).
-                QString genericSearchTerm;
-            };
-
-            // Construction/destruction
-
-            /*! Lists the public rooms on the server with optional filter.
-             * \param server
-             *   The server to fetch the public room lists from. Defaults to the
-             *   local server.
-             * \param limit
-             *   Limit the number of results returned.
-             * \param since
-             *   A pagination token from a previous request, allowing clients
-             *   to get the next (or previous) batch of rooms.  The direction
-             *   of pagination is specified solely by which token is supplied,
-             *   rather than via an explicit flag.
-             * \param filter
-             *   Filter to apply to the results.
-             * \param includeAllNetworks
-             *   Whether or not to include all known networks/protocols from
-             *   application services on the homeserver. Defaults to false.
-             * \param thirdPartyInstanceId
-             *   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, Omittable<bool> includeAllNetworks = none, const QString& thirdPartyInstanceId = {});
-            ~QueryPublicRoomsJob() override;
-
-            // Result properties
-
-            /// A list of the rooms on the server.
-            const PublicRoomsResponse& data() const;
-
-        protected:
-            Status parseJson(const QJsonDocument& data) override;
-
-        private:
-            class Private;
-            QScopedPointer<Private> d;
-    };
-} // namespace QMatrixClient
+        addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"),
+                             pod.genericSearchTerm);
+    }
+};
+
+} // namespace Quotient