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, 10 insertions, 10 deletions

diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp
index b351b4ef..c1255bb1 100644
--- a/lib/csapi/directory.cpp
+++ b/lib/csapi/directory.cpp
@@ -8,48 +8,48 @@ using namespace Quotient;
 
 SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetRoomAliasJob"),
-              makePath("/_matrix/client/r0", "/directory/room/", roomAlias))
+              makePath("/_matrix/client/v3", "/directory/room/", roomAlias))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("room_id"), roomId);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("room_id"), roomId);
+    setRequestData({ _dataJson });
 }
 
 QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0",
+                                   makePath("/_matrix/client/v3",
                                             "/directory/room/", roomAlias));
 }
 
 GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomIdByAliasJob"),
-              makePath("/_matrix/client/r0", "/directory/room/", roomAlias),
+              makePath("/_matrix/client/v3", "/directory/room/", roomAlias),
               false)
 {}
 
 QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0",
+                                   makePath("/_matrix/client/v3",
                                             "/directory/room/", roomAlias));
 }
 
 DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteRoomAliasJob"),
-              makePath("/_matrix/client/r0", "/directory/room/", roomAlias))
+              makePath("/_matrix/client/v3", "/directory/room/", roomAlias))
 {}
 
 QUrl GetLocalAliasesJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0", "/rooms/",
+                                   makePath("/_matrix/client/v3", "/rooms/",
                                             roomId, "/aliases"));
 }
 
 GetLocalAliasesJob::GetLocalAliasesJob(const QString& roomId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetLocalAliasesJob"),
-              makePath("/_matrix/client/r0", "/rooms/", roomId, "/aliases"))
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/aliases"))
 {
     addExpectedKey("aliases");
 }