Merge branch 'dev' into device-verification

# Conflicts:
#	autotests/testfilecrypto.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/database.cpp
#	lib/database.h
#	lib/e2ee/qolmoutboundsession.cpp
#	lib/e2ee/qolmoutboundsession.h
#	lib/eventitem.h
#	lib/events/encryptedevent.cpp
#	lib/events/encryptedevent.h
#	lib/events/encryptedfile.cpp
#	lib/events/encryptedfile.h
#	lib/events/keyverificationevent.cpp
#	lib/events/keyverificationevent.h
#	lib/events/roomkeyevent.h
#	lib/room.cpp
#	lib/room.h

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp
index 59275e41..3ca986c7 100644
--- a/lib/csapi/third_party_membership.cpp
+++ b/lib/csapi/third_party_membership.cpp
@@ -10,12 +10,12 @@ InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer,
                                  const QString& idAccessToken,
                                  const QString& medium, const QString& address)
     : BaseJob(HttpVerb::Post, QStringLiteral("InviteBy3PIDJob"),
-              makePath("/_matrix/client/r0", "/rooms/", roomId, "/invite"))
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/invite"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("id_server"), idServer);
-    addParam<>(_data, QStringLiteral("id_access_token"), idAccessToken);
-    addParam<>(_data, QStringLiteral("medium"), medium);
-    addParam<>(_data, QStringLiteral("address"), address);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("id_server"), idServer);
+    addParam<>(_dataJson, QStringLiteral("id_access_token"), idAccessToken);
+    addParam<>(_dataJson, QStringLiteral("medium"), medium);
+    addParam<>(_dataJson, QStringLiteral("address"), address);
+    setRequestData({ _dataJson });
 }