3 files changed, 11 insertions, 9 deletions
diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index 38292f49..1cb729d3 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -3,6 +3,8 @@
 #include <QThread>
 #include <QTimer>
 
+#include <mtx/responses/common.hpp>
+
 #include "Cache.h"
 #include "Cache_p.h"
 #include "ChatPage.h"
@@ -10,6 +12,7 @@
 #include "Logging.h"
 #include "MatrixClient.h"
 #include "Olm.h"
+#include "Utils.h"
 
 Q_DECLARE_METATYPE(Reaction)
 
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 598af31e..f9d7d00c 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -11,6 +11,7 @@
 #include "ChatPage.h"
 #include "ColorImageProvider.h"
 #include "DelegateChooser.h"
+#include "DeviceVerificationFlow.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
@@ -461,13 +462,10 @@ TimelineViewManager::receivedSessionKey(const std::string &room_id, const std::s
 }
 
 void
-TimelineViewManager::initWithMessages(const std::map<QString, mtx::responses::Timeline> &msgs)
+TimelineViewManager::initWithMessages(const std::vector<QString> &roomIds)
 {
-        for (const auto &e : msgs) {
-                addRoom(e.first);
-
-                models.value(e.first)->addEvents(e.second);
-        }
+        for (const auto &roomId : roomIds)
+                addRoom(roomId);
 }
 
 void
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 895c4b39..67eeee5b 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -7,11 +7,11 @@
 #include <QWidget>
 
 #include <mtx/common.hpp>
-#include <mtx/responses.hpp>
+#include <mtx/responses/messages.hpp>
+#include <mtx/responses/sync.hpp>
 
 #include "Cache.h"
 #include "CallManager.h"
-#include "DeviceVerificationFlow.h"
 #include "Logging.h"
 #include "TimelineModel.h"
 #include "Utils.h"
@@ -24,6 +24,7 @@ class BlurhashProvider;
 class ColorImageProvider;
 class UserSettings;
 class ChatPage;
+class DeviceVerificationFlow;
 
 class TimelineViewManager : public QObject
 {
@@ -97,7 +98,7 @@ signals:
 public slots:
         void updateReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
         void receivedSessionKey(const std::string &room_id, const std::string &session_id);
-        void initWithMessages(const std::map<QString, mtx::responses::Timeline> &msgs);
+        void initWithMessages(const std::vector<QString> &roomIds);
 
         void setHistoryView(const QString &room_id);
         void updateColorPalette();