d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lazy load initial timeline events

Browse source
This commit is contained in:
Konstantinos Sideris 2017-06-05 19:54:45 +03:00
parent 36d25951dc
commit 26dfbfd08c
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/MatrixClient.h
View file

@ -44,7 +44,7 @@ public:
void fetchUserAvatar(const QString &userId, const QUrl &avatarUrl); void fetchUserAvatar(const QString &userId, const QUrl &avatarUrl);
void fetchOwnAvatar(const QUrl &avatar_url); void fetchOwnAvatar(const QUrl &avatar_url);
void downloadImage(const QString &event_id, const QUrl &url); void downloadImage(const QString &event_id, const QUrl &url);
void messages(const QString &room_id, const QString &from_token) noexcept; void messages(const QString &room_id, const QString &from_token, int limit = 20) noexcept;
inline QUrl getHomeServer(); inline QUrl getHomeServer();
inline int transactionId(); inline int transactionId();

5
src/MatrixClient.cc
View file

@ -541,7 +541,7 @@ void MatrixClient::initialSync() noexcept
}; };
QJsonObject filter{{"room", QJsonObject filter{{"room",
QJsonObject{{"timeline", QJsonObject{{"limit", 70}}}, QJsonObject{{"timeline", QJsonObject{{"limit", 20}}},
{"ephemeral", QJsonObject{{"limit", 0}}}}}, {"ephemeral", QJsonObject{{"limit", 0}}}}},
{"presence", QJsonObject{{"not_types", excluded_presence}}}}; {"presence", QJsonObject{{"not_types", excluded_presence}}}};
@ -677,12 +677,13 @@ void MatrixClient::fetchOwnAvatar(const QUrl &avatar_url)
reply->setProperty("endpoint", static_cast<int>(Endpoint::GetOwnAvatar)); reply->setProperty("endpoint", static_cast<int>(Endpoint::GetOwnAvatar));
} }
void MatrixClient::messages(const QString &room_id, const QString &from_token) noexcept void MatrixClient::messages(const QString &room_id, const QString &from_token, int limit) noexcept
{ {
QUrlQuery query; QUrlQuery query;
query.addQueryItem("access_token", token_); query.addQueryItem("access_token", token_);
query.addQueryItem("from", from_token); query.addQueryItem("from", from_token);
query.addQueryItem("dir", "b"); query.addQueryItem("dir", "b");
query.addQueryItem("limit", QString::number(limit));
QUrl endpoint(server_); QUrl endpoint(server_);
endpoint.setPath(api_url_ + QString("/rooms/%1/messages").arg(room_id)); endpoint.setPath(api_url_ + QString("/rooms/%1/messages").arg(room_id));

14
src/TimelineView.cc
View file

@ -76,7 +76,7 @@ void TimelineView::scrollDown()
// The first time we enter the room move the scroll bar to the bottom. // The first time we enter the room move the scroll bar to the bottom.
if (!isInitialized) { if (!isInitialized) {
scroll_area_->ensureVisible(0, scroll_widget_->size().height(), 0, 0); scroll_area_->verticalScrollBar()->setValue(max);
isInitialized = true; isInitialized = true;
return; return;
} }
@ -226,11 +226,6 @@ int TimelineView::addEvents(const Timeline &timeline)
QSettings settings; QSettings settings;
QString localUser = settings.value("auth/user_id").toString(); QString localUser = settings.value("auth/user_id").toString();
if (isInitialSync) {
prev_batch_token_ = timeline.previousBatch();
isInitialSync = false;
}
for (const auto &event : timeline.events()) { for (const auto &event : timeline.events()) {
TimelineItem *item = parseMessageEvent(event.toObject(), TimelineDirection::Bottom); TimelineItem *item = parseMessageEvent(event.toObject(), TimelineDirection::Bottom);
auto sender = event.toObject().value("sender").toString(); auto sender = event.toObject().value("sender").toString();
@ -243,6 +238,13 @@ int TimelineView::addEvents(const Timeline &timeline)
} }
} }
if (isInitialSync) {
prev_batch_token_ = timeline.previousBatch();
isInitialSync = false;
client_->messages(room_id_, prev_batch_token_);
}
return message_count; return message_count;
} }

3
src/TimelineViewManager.cc
View file

@ -119,9 +119,10 @@ void TimelineViewManager::setHistoryView(const QString &room_id)
active_room_ = room_id; active_room_ = room_id;
auto widget = views_.value(room_id); auto widget = views_.value(room_id);
widget->scrollDown();
setCurrentWidget(widget.data()); setCurrentWidget(widget.data());
widget->scrollDown();
} }
QMap<QString, QString> TimelineViewManager::NICK_COLORS; QMap<QString, QString> TimelineViewManager::NICK_COLORS;