1 files changed, 9 insertions, 62 deletions
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index 3aa7d736..e18108ac 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -4,71 +4,18 @@
 
 #include "room_state.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
+using namespace Quotient;
 
-class SetRoomStateWithKeyJob::Private
-{
-    public:
-        QString eventId;
-};
-
-static const auto SetRoomStateWithKeyJobName = QStringLiteral("SetRoomStateWithKeyJob");
-
-SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body)
-    : BaseJob(HttpVerb::Put, SetRoomStateWithKeyJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey)
-    , d(new Private)
+SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId,
+                                               const QString& eventType,
+                                               const QString& stateKey,
+                                               const QJsonObject& body)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomStateWithKeyJob"),
+              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+                  % "/state/" % eventType % "/" % stateKey)
 {
     setRequestData(Data(toJson(body)));
+    addExpectedKey("event_id");
 }
-
-SetRoomStateWithKeyJob::~SetRoomStateWithKeyJob() = default;
-
-const QString& SetRoomStateWithKeyJob::eventId() const
-{
-    return d->eventId;
-}
-
-BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    fromJson(json.value("event_id"_ls), d->eventId);
-    return Success;
-}
-
-class SetRoomStateJob::Private
-{
-    public:
-        QString eventId;
-};
-
-static const auto SetRoomStateJobName = QStringLiteral("SetRoomStateJob");
-
-SetRoomStateJob::SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body)
-    : BaseJob(HttpVerb::Put, SetRoomStateJobName,
-        basePath % "/rooms/" % roomId % "/state/" % eventType)
-    , d(new Private)
-{
-    setRequestData(Data(toJson(body)));
-}
-
-SetRoomStateJob::~SetRoomStateJob() = default;
-
-const QString& SetRoomStateJob::eventId() const
-{
-    return d->eventId;
-}
-
-BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    fromJson(json.value("event_id"_ls), d->eventId);
-    return Success;
-}
-