New upstream version 0.7.0

1 files changed, 17 insertions, 25 deletions

diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index 4065207b..e04075b7 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -4,34 +4,26 @@
 
 #include "banning.h"
 
-#include "converters.h"
+using namespace Quotient;
 
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-static const auto BanJobName = QStringLiteral("BanJob");
-
-BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason)
-    : BaseJob(HttpVerb::Post, BanJobName,
-        basePath % "/rooms/" % roomId % "/ban")
+BanJob::BanJob(const QString& roomId, const QString& userId,
+               const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("BanJob"),
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/ban"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("user_id"), userId);
-    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
-    setRequestData(_data);
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("user_id"), userId);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
 }
 
-static const auto UnbanJobName = QStringLiteral("UnbanJob");
-
-UnbanJob::UnbanJob(const QString& roomId, const QString& userId)
-    : BaseJob(HttpVerb::Post, UnbanJobName,
-        basePath % "/rooms/" % roomId % "/unban")
+UnbanJob::UnbanJob(const QString& roomId, const QString& userId,
+                   const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("UnbanJob"),
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/unban"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("user_id"), userId);
-    setRequestData(_data);
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("user_id"), userId);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
 }
-