thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into webrtc-video

Browse source
This commit is contained in:
trilene 2020-10-28 16:08:17 -04:00
commit fd479a91be
37 changed files with 452 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/timeline/TimelineViewManager.cpp
View file

@ -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