Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir 30dcb77a77433e4a54eab77c0b82ae925dead2d8

1 files changed, 12 insertions, 13 deletions

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