1 files changed, 15 insertions, 84 deletions
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 664959f4..028022c5 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -4,97 +4,29 @@
 
 #include "pusher.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-namespace QMatrixClient
-{
-    // Converters
-
-    template <> struct JsonObjectConverter<GetPushersJob::PusherData>
-    {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::PusherData& result)
-        {
-            fromJson(jo.value("url"_ls), result.url);
-            fromJson(jo.value("format"_ls), result.format);
-        }
-    };
-
-    template <> struct JsonObjectConverter<GetPushersJob::Pusher>
-    {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::Pusher& result)
-        {
-            fromJson(jo.value("pushkey"_ls), result.pushkey);
-            fromJson(jo.value("kind"_ls), result.kind);
-            fromJson(jo.value("app_id"_ls), result.appId);
-            fromJson(jo.value("app_display_name"_ls), result.appDisplayName);
-            fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
-            fromJson(jo.value("profile_tag"_ls), result.profileTag);
-            fromJson(jo.value("lang"_ls), result.lang);
-            fromJson(jo.value("data"_ls), result.data);
-        }
-    };
-} // namespace QMatrixClient
-
-class GetPushersJob::Private
-{
-    public:
-        QVector<Pusher> pushers;
-};
+using namespace Quotient;
 
 QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushers");
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/pushers");
 }
 
-static const auto GetPushersJobName = QStringLiteral("GetPushersJob");
-
 GetPushersJob::GetPushersJob()
-    : BaseJob(HttpVerb::Get, GetPushersJobName,
-        basePath % "/pushers")
-    , d(new Private)
-{
-}
-
-GetPushersJob::~GetPushersJob() = default;
-
-const QVector<GetPushersJob::Pusher>& GetPushersJob::pushers() const
-{
-    return d->pushers;
-}
-
-BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    fromJson(json.value("pushers"_ls), d->pushers);
-    return Success;
-}
-
-namespace QMatrixClient
-{
-    // Converters
-
-    template <> struct JsonObjectConverter<PostPusherJob::PusherData>
-    {
-        static void dumpTo(QJsonObject& jo, const PostPusherJob::PusherData& pod)
-        {
-            addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
-            addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
-        }
-    };
-} // namespace QMatrixClient
-
-static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
-
-PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, Omittable<bool> append)
-    : BaseJob(HttpVerb::Post, PostPusherJobName,
-        basePath % "/pushers/set")
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetPushersJob"),
+              QStringLiteral("/_matrix/client/r0") % "/pushers")
+{}
+
+PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
+                             const QString& appId, const QString& appDisplayName,
+                             const QString& deviceDisplayName,
+                             const QString& lang, const PusherData& data,
+                             const QString& profileTag, Omittable<bool> append)
+    : BaseJob(HttpVerb::Post, QStringLiteral("PostPusherJob"),
+              QStringLiteral("/_matrix/client/r0") % "/pushers/set")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("pushkey"), pushkey);
@@ -106,6 +38,5 @@ PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const
     addParam<>(_data, QStringLiteral("lang"), lang);
     addParam<>(_data, QStringLiteral("data"), data);
     addParam<IfNotEmpty>(_data, QStringLiteral("append"), append);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
 }
-