Merge pull request #405 from quotient-im/kitsune-basejob-store-json-response

Store JSON response in BaseJob + tweaks to the generated code

1 files changed, 3 insertions, 63 deletions

diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp
index 14173e94..9619c441 100644
--- a/lib/csapi/admin.cpp
+++ b/lib/csapi/admin.cpp
@@ -4,78 +4,18 @@
 
 #include "admin.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-// Converters
-namespace Quotient {
-
-template <>
-struct JsonObjectConverter<GetWhoIsJob::ConnectionInfo> {
-    static void fillFrom(const QJsonObject& jo,
-                         GetWhoIsJob::ConnectionInfo& result)
-    {
-        fromJson(jo.value("ip"_ls), result.ip);
-        fromJson(jo.value("last_seen"_ls), result.lastSeen);
-        fromJson(jo.value("user_agent"_ls), result.userAgent);
-    }
-};
-
-template <>
-struct JsonObjectConverter<GetWhoIsJob::SessionInfo> {
-    static void fillFrom(const QJsonObject& jo, GetWhoIsJob::SessionInfo& result)
-    {
-        fromJson(jo.value("connections"_ls), result.connections);
-    }
-};
-
-template <>
-struct JsonObjectConverter<GetWhoIsJob::DeviceInfo> {
-    static void fillFrom(const QJsonObject& jo, GetWhoIsJob::DeviceInfo& result)
-    {
-        fromJson(jo.value("sessions"_ls), result.sessions);
-    }
-};
-
-} // namespace Quotient
-
-class GetWhoIsJob::Private {
-public:
-    QString userId;
-    QHash<QString, DeviceInfo> devices;
-};
-
 QUrl GetWhoIsJob::makeRequestUrl(QUrl baseUrl, const QString& userId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   basePath % "/admin/whois/" % userId);
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/admin/whois/" % userId);
 }
 
 GetWhoIsJob::GetWhoIsJob(const QString& userId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetWhoIsJob"),
-              basePath % "/admin/whois/" % userId)
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/admin/whois/" % userId)
 {}
-
-GetWhoIsJob::~GetWhoIsJob() = default;
-
-const QString& GetWhoIsJob::userId() const { return d->userId; }
-
-const QHash<QString, GetWhoIsJob::DeviceInfo>& GetWhoIsJob::devices() const
-{
-    return d->devices;
-}
-
-BaseJob::Status GetWhoIsJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    fromJson(json.value("user_id"_ls), d->userId);
-    fromJson(json.value("devices"_ls), d->devices);
-
-    return Success;
-}