Merge branch 'upstream' (v0.5.2)

1 files changed, 28 insertions, 0 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 5021c73a..96b32a92 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -21,6 +21,20 @@ SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
     setRequestData(Data(toJson(content)));
 }
 
+QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& type)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+            basePath % "/user/" % userId % "/account_data/" % type);
+}
+
+static const auto GetAccountDataJobName = QStringLiteral("GetAccountDataJob");
+
+GetAccountDataJob::GetAccountDataJob(const QString& userId, const QString& type)
+    : BaseJob(HttpVerb::Get, GetAccountDataJobName,
+        basePath % "/user/" % userId % "/account_data/" % type)
+{
+}
+
 static const auto SetAccountDataPerRoomJobName = QStringLiteral("SetAccountDataPerRoomJob");
 
 SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content)
@@ -30,3 +44,17 @@ SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const
     setRequestData(Data(toJson(content)));
 }
 
+QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& type)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+            basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type);
+}
+
+static const auto GetAccountDataPerRoomJobName = QStringLiteral("GetAccountDataPerRoomJob");
+
+GetAccountDataPerRoomJob::GetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type)
+    : BaseJob(HttpVerb::Get, GetAccountDataPerRoomJobName,
+        basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type)
+{
+}
+