Update upstream source from tag 'upstream/0.7.0'

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

1 files changed, 15 insertions, 13 deletions

diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 4761e949..cdba95e9 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -4,39 +4,41 @@
 
 #include "joining.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 JoinRoomByIdJob::JoinRoomByIdJob(
-    const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned)
+    const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned,
+    const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomByIdJob"),
-              QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/join")
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/join"))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
-    setRequestData(std::move(_data));
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
     addExpectedKey("room_id");
 }
 
 auto queryToJoinRoom(const QStringList& serverName)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("server_name"), serverName);
     return _q;
 }
 
 JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
                          const QStringList& serverName,
-                         const Omittable<ThirdPartySigned>& thirdPartySigned)
+                         const Omittable<ThirdPartySigned>& thirdPartySigned,
+                         const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomJob"),
-              QStringLiteral("/_matrix/client/r0") % "/join/" % roomIdOrAlias,
+              makePath("/_matrix/client/v3", "/join/", roomIdOrAlias),
               queryToJoinRoom(serverName))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
-    setRequestData(std::move(_data));
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
     addExpectedKey("room_id");
 }