Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 38 insertions, 2 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 40388673..7d4f1ad7 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -22,8 +22,23 @@ 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");
+    QStringLiteral("SetAccountDataPerRoomJob");
 
 SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
                                                    const QString& roomId,
@@ -31,7 +46,28 @@ SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
                                                    const QJsonObject& content)
     : BaseJob(HttpVerb::Put, SetAccountDataPerRoomJobName,
               basePath % "/user/" % userId % "/rooms/" % roomId
-                      % "/account_data/" % type)
+                  % "/account_data/" % type)
 {
     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)
+{}