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

diff --git a/lib/csapi/relations.cpp b/lib/csapi/relations.cpp
new file mode 100644
index 00000000..8bcecee4
--- /dev/null
+++ b/lib/csapi/relations.cpp
@@ -0,0 +1,111 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "relations.h"
+
+using namespace Quotient;
+
+auto queryToGetRelatingEvents(const QString& from, const QString& to,
+                              Omittable<int> limit)
+{
+    QUrlQuery _q;
+    addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
+    addParam<IfNotEmpty>(_q, QStringLiteral("to"), to);
+    addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
+    return _q;
+}
+
+QUrl GetRelatingEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                                          const QString& eventId,
+                                          const QString& from, const QString& to,
+                                          Omittable<int> limit)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+                                   makePath("/_matrix/client/v1", "/rooms/",
+                                            roomId, "/relations/", eventId),
+                                   queryToGetRelatingEvents(from, to, limit));
+}
+
+GetRelatingEventsJob::GetRelatingEventsJob(const QString& roomId,
+                                           const QString& eventId,
+                                           const QString& from,
+                                           const QString& to,
+                                           Omittable<int> limit)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetRelatingEventsJob"),
+              makePath("/_matrix/client/v1", "/rooms/", roomId, "/relations/",
+                       eventId),
+              queryToGetRelatingEvents(from, to, limit))
+{
+    addExpectedKey("chunk");
+}
+
+auto queryToGetRelatingEventsWithRelType(const QString& from, const QString& to,
+                                         Omittable<int> limit)
+{
+    QUrlQuery _q;
+    addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
+    addParam<IfNotEmpty>(_q, QStringLiteral("to"), to);
+    addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
+    return _q;
+}
+
+QUrl GetRelatingEventsWithRelTypeJob::makeRequestUrl(
+    QUrl baseUrl, const QString& roomId, const QString& eventId,
+    const QString& relType, const QString& from, const QString& to,
+    Omittable<int> limit)
+{
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl),
+        makePath("/_matrix/client/v1", "/rooms/", roomId, "/relations/",
+                 eventId, "/", relType),
+        queryToGetRelatingEventsWithRelType(from, to, limit));
+}
+
+GetRelatingEventsWithRelTypeJob::GetRelatingEventsWithRelTypeJob(
+    const QString& roomId, const QString& eventId, const QString& relType,
+    const QString& from, const QString& to, Omittable<int> limit)
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetRelatingEventsWithRelTypeJob"),
+              makePath("/_matrix/client/v1", "/rooms/", roomId, "/relations/",
+                       eventId, "/", relType),
+              queryToGetRelatingEventsWithRelType(from, to, limit))
+{
+    addExpectedKey("chunk");
+}
+
+auto queryToGetRelatingEventsWithRelTypeAndEventType(const QString& from,
+                                                     const QString& to,
+                                                     Omittable<int> limit)
+{
+    QUrlQuery _q;
+    addParam<IfNotEmpty>(_q, QStringLiteral("from"), from);
+    addParam<IfNotEmpty>(_q, QStringLiteral("to"), to);
+    addParam<IfNotEmpty>(_q, QStringLiteral("limit"), limit);
+    return _q;
+}
+
+QUrl GetRelatingEventsWithRelTypeAndEventTypeJob::makeRequestUrl(
+    QUrl baseUrl, const QString& roomId, const QString& eventId,
+    const QString& relType, const QString& eventType, const QString& from,
+    const QString& to, Omittable<int> limit)
+{
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl),
+        makePath("/_matrix/client/v1", "/rooms/", roomId, "/relations/",
+                 eventId, "/", relType, "/", eventType),
+        queryToGetRelatingEventsWithRelTypeAndEventType(from, to, limit));
+}
+
+GetRelatingEventsWithRelTypeAndEventTypeJob::
+    GetRelatingEventsWithRelTypeAndEventTypeJob(
+        const QString& roomId, const QString& eventId, const QString& relType,
+        const QString& eventType, const QString& from, const QString& to,
+        Omittable<int> limit)
+    : BaseJob(HttpVerb::Get,
+              QStringLiteral("GetRelatingEventsWithRelTypeAndEventTypeJob"),
+              makePath("/_matrix/client/v1", "/rooms/", roomId, "/relations/",
+                       eventId, "/", relType, "/", eventType),
+              queryToGetRelatingEventsWithRelTypeAndEventType(from, to, limit))
+{
+    addExpectedKey("chunk");
+}