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, 43 insertions, 0 deletions

diff --git a/lib/csapi/space_hierarchy.cpp b/lib/csapi/space_hierarchy.cpp
new file mode 100644
index 00000000..7b5c7eac
--- /dev/null
+++ b/lib/csapi/space_hierarchy.cpp
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "space_hierarchy.h"
+
+using namespace Quotient;
+
+auto queryToGetSpaceHierarchy(Omittable<bool> suggestedOnly,
+                              Omittable<int> limit, Omittable<int> maxDepth,
+                              const QString& from)
+{
+    QUrlQuery _q;
+    addParam<IfNotEmpty>(_q, QStringLiteral("suggested_only"), suggestedOnly);
+    addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
+    addParam<IfNotEmpty>(_q, QStringLiteral("max_depth"), maxDepth);
+    addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
+    return _q;
+}
+
+QUrl GetSpaceHierarchyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                          Omittable<bool> suggestedOnly,
+                                          Omittable<int> limit,
+                                          Omittable<int> maxDepth,
+                                          const QString& from)
+{
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl),
+        makePath("/_matrix/client/v1", "/rooms/", roomId, "/hierarchy"),
+        queryToGetSpaceHierarchy(suggestedOnly, limit, maxDepth, from));
+}
+
+GetSpaceHierarchyJob::GetSpaceHierarchyJob(const QString& roomId,
+                                           Omittable<bool> suggestedOnly,
+                                           Omittable<int> limit,
+                                           Omittable<int> maxDepth,
+                                           const QString& from)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetSpaceHierarchyJob"),
+              makePath("/_matrix/client/v1", "/rooms/", roomId, "/hierarchy"),
+              queryToGetSpaceHierarchy(suggestedOnly, limit, maxDepth, from))
+{
+    addExpectedKey("rooms");
+}