Merge branch 'master' into kitsune-gtad

1 files changed, 8 insertions, 3 deletions

diff --git a/jobs/syncjob.cpp b/jobs/syncjob.cpp
index ce5dd894..7b066f4f 100644
--- a/jobs/syncjob.cpp
+++ b/jobs/syncjob.cpp
@@ -54,6 +54,11 @@ SyncDataList&& SyncData::takeRoomData()
     return std::move(roomData);
 }
 
+SyncBatch<Event>&& SyncData::takeAccountData()
+{
+    return std::move(accountData);
+}
+
 BaseJob::Status SyncJob::parseJson(const QJsonDocument& data)
 {
     return d.parseJson(data);
@@ -63,12 +68,12 @@ BaseJob::Status SyncData::parseJson(const QJsonDocument &data)
 {
     QElapsedTimer et; et.start();
 
-    QJsonObject json = data.object();
+    auto json { data.object() };
     nextBatch_ = json.value("next_batch").toString();
     // TODO: presence
-    // TODO: account_data
-    QJsonObject rooms = json.value("rooms").toObject();
+    accountData.fromJson(json);
 
+    QJsonObject rooms = json.value("rooms").toObject();
     for (size_t i = 0; i < JoinStateStrings.size(); ++i)
     {
         const auto rs = rooms.value(JoinStateStrings[i]).toObject();