Update upstream source from tag 'upstream/0.7.0'

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

1 files changed, 9 insertions, 16 deletions

diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index 8bd170bf..ba91f26a 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -4,32 +4,25 @@
 
 #include "leaving.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
-QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
+LeaveRoomJob::LeaveRoomJob(const QString& roomId, const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("LeaveRoomJob"),
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/leave"))
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/leave");
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
 }
 
-LeaveRoomJob::LeaveRoomJob(const QString& roomId)
-    : BaseJob(HttpVerb::Post, QStringLiteral("LeaveRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/leave")
-{}
-
 QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/forget");
+                                   makePath("/_matrix/client/v3", "/rooms/",
+                                            roomId, "/forget"));
 }
 
 ForgetRoomJob::ForgetRoomJob(const QString& roomId)
     : BaseJob(HttpVerb::Post, QStringLiteral("ForgetRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
-                  % "/forget")
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/forget"))
 {}