1 files changed, 57 insertions, 128 deletions
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 2fdb2005..4deecfc2 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -4,158 +4,87 @@
 
 #include "list_public_rooms.h"
 
-#include "converters.h"
+using namespace Quotient;
 
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class GetRoomVisibilityOnDirectoryJob::Private
-{
-    public:
-        QString visibility;
-};
-
-QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
+QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl,
+                                                     const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/directory/list/room/" % roomId);
-}
-
-static const auto GetRoomVisibilityOnDirectoryJobName = QStringLiteral("GetRoomVisibilityOnDirectoryJob");
-
-GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(const QString& roomId)
-    : BaseJob(HttpVerb::Get, GetRoomVisibilityOnDirectoryJobName,
-        basePath % "/directory/list/room/" % roomId, false)
-    , d(new Private)
-{
-}
-
-GetRoomVisibilityOnDirectoryJob::~GetRoomVisibilityOnDirectoryJob() = default;
-
-const QString& GetRoomVisibilityOnDirectoryJob::visibility() const
-{
-    return d->visibility;
+                                   makePath("/_matrix/client/v3",
+                                            "/directory/list/room/", roomId));
 }
 
-BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    d->visibility = fromJson<QString>(json.value("visibility"_ls));
-    return Success;
+GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(
+    const QString& roomId)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomVisibilityOnDirectoryJob"),
+              makePath("/_matrix/client/v3", "/directory/list/room/", roomId),
+              false)
+{}
+
+SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(
+    const QString& roomId, const QString& visibility)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomVisibilityOnDirectoryJob"),
+              makePath("/_matrix/client/v3", "/directory/list/room/", roomId))
+{
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("visibility"), visibility);
+    setRequestData({ _dataJson });
 }
 
-static const auto SetRoomVisibilityOnDirectoryJobName = QStringLiteral("SetRoomVisibilityOnDirectoryJob");
-
-SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility)
-    : BaseJob(HttpVerb::Put, SetRoomVisibilityOnDirectoryJobName,
-        basePath % "/directory/list/room/" % roomId)
+auto queryToGetPublicRooms(Omittable<int> limit, const QString& since,
+                           const QString& server)
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
-    setRequestData(_data);
-}
-
-class GetPublicRoomsJob::Private
-{
-    public:
-        PublicRoomsResponse data;
-};
-
-BaseJob::Query queryToGetPublicRooms(Omittable<int> limit, const QString& since, const QString& server)
-{
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
     addParam<IfNotEmpty>(_q, QStringLiteral("since"), since);
     addParam<IfNotEmpty>(_q, QStringLiteral("server"), server);
     return _q;
 }
 
-QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit, const QString& since, const QString& server)
+QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, Omittable<int> limit,
+                                       const QString& since,
+                                       const QString& server)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/publicRooms",
-            queryToGetPublicRooms(limit, since, server));
+                                   makePath("/_matrix/client/v3",
+                                            "/publicRooms"),
+                                   queryToGetPublicRooms(limit, since, server));
 }
 
-static const auto GetPublicRoomsJobName = QStringLiteral("GetPublicRoomsJob");
-
-GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since, const QString& server)
-    : BaseJob(HttpVerb::Get, GetPublicRoomsJobName,
-        basePath % "/publicRooms",
-        queryToGetPublicRooms(limit, since, server),
-        {}, false)
-    , d(new Private)
+GetPublicRoomsJob::GetPublicRoomsJob(Omittable<int> limit, const QString& since,
+                                     const QString& server)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetPublicRoomsJob"),
+              makePath("/_matrix/client/v3", "/publicRooms"),
+              queryToGetPublicRooms(limit, since, server), {}, false)
 {
+    addExpectedKey("chunk");
 }
 
-GetPublicRoomsJob::~GetPublicRoomsJob() = default;
-
-const PublicRoomsResponse& GetPublicRoomsJob::data() const
+auto queryToQueryPublicRooms(const QString& server)
 {
-    return d->data;
-}
-
-BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
-{
-    d->data = fromJson<PublicRoomsResponse>(data);
-    return Success;
-}
-
-namespace QMatrixClient
-{
-    // Converters
-
-    QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod)
-    {
-        QJsonObject jo;
-        addParam<IfNotEmpty>(jo, QStringLiteral("generic_search_term"), pod.genericSearchTerm);
-        return jo;
-    }
-} // namespace QMatrixClient
-
-class QueryPublicRoomsJob::Private
-{
-    public:
-        PublicRoomsResponse data;
-};
-
-BaseJob::Query queryToQueryPublicRooms(const QString& server)
-{
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("server"), server);
     return _q;
 }
 
-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)
-    : BaseJob(HttpVerb::Post, QueryPublicRoomsJobName,
-        basePath % "/publicRooms",
-        queryToQueryPublicRooms(server))
-    , d(new Private)
-{
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("limit"), limit);
-    addParam<IfNotEmpty>(_data, QStringLiteral("since"), since);
-    addParam<IfNotEmpty>(_data, QStringLiteral("filter"), filter);
-    addParam<IfNotEmpty>(_data, QStringLiteral("include_all_networks"), includeAllNetworks);
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_instance_id"), thirdPartyInstanceId);
-    setRequestData(_data);
-}
-
-QueryPublicRoomsJob::~QueryPublicRoomsJob() = default;
-
-const PublicRoomsResponse& QueryPublicRoomsJob::data() const
-{
-    return d->data;
+QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server,
+                                         Omittable<int> limit,
+                                         const QString& since,
+                                         const Omittable<Filter>& filter,
+                                         Omittable<bool> includeAllNetworks,
+                                         const QString& thirdPartyInstanceId)
+    : BaseJob(HttpVerb::Post, QStringLiteral("QueryPublicRoomsJob"),
+              makePath("/_matrix/client/v3", "/publicRooms"),
+              queryToQueryPublicRooms(server))
+{
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("limit"), limit);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("since"), since);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("filter"), filter);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("include_all_networks"),
+                         includeAllNetworks);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("third_party_instance_id"),
+                         thirdPartyInstanceId);
+    setRequestData({ _dataJson });
+    addExpectedKey("chunk");
 }
-
-BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data)
-{
-    d->data = fromJson<PublicRoomsResponse>(data);
-    return Success;
-}
-