rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix infinite pagination properly now.

This commit is contained in:
Nicolas Werner 2020-10-23 19:42:12 +02:00
parent 1ab20e0ee3
commit 4797b9fa96
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Cache.cpp
View File

@ -2712,8 +2712,19 @@ Cache::saveOldMessages(const std::string &room_id, const mtx::responses::Message
} }
} }
if (res.chunk.empty()) if (res.chunk.empty()) {
if (lmdb::dbi_get(txn, orderDb, lmdb::val(&index, sizeof(index)), val)) {
auto orderEntry = json::parse(std::string_view(val.data(), val.size()));
orderEntry["prev_batch"] = res.end;
lmdb::dbi_put(txn,
orderDb,
lmdb::val(&index, sizeof(index)),
lmdb::val(orderEntry.dump()));
nhlog::db()->debug("saving '{}'", orderEntry.dump());
txn.commit();
}
return index; return index;
}
std::string event_id_val; std::string event_id_val;
for (const auto &e : res.chunk) { for (const auto &e : res.chunk) {

4
src/TextInputWidget.cpp
View File

@ -450,8 +450,8 @@ FilteredTextEdit::completerRect()
auto item_height = completer_->popup()->sizeHintForRow(0); auto item_height = completer_->popup()->sizeHintForRow(0);
auto max_height = item_height * completer_->maxVisibleItems(); auto max_height = item_height * completer_->maxVisibleItems();
auto height = (completer_->completionCount() > completer_->maxVisibleItems()) auto height = (completer_->completionCount() > completer_->maxVisibleItems())
? max_height ? max_height
: completer_->completionCount() * item_height; : completer_->completionCount() * item_height;
rect.setWidth(completer_->popup()->sizeHintForColumn(0)); rect.setWidth(completer_->popup()->sizeHintForColumn(0));
rect.moveBottom(-height); rect.moveBottom(-height);
return rect; return rect;

2
src/Utils.cpp
View File

@ -638,7 +638,7 @@ utils::luminance(const QColor &col)
qreal lumRgb[3]; qreal lumRgb[3];
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
qreal v = colRgb[i] / 255.0; qreal v = colRgb[i] / 255.0;
v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4); v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4);
} }

5
src/timeline/EventStore.cpp
View File

@ -54,8 +54,11 @@ EventStore::EventStore(std::string room_id, QObject *)
&EventStore::oldMessagesRetrieved, &EventStore::oldMessagesRetrieved,
this, this,
[this](const mtx::responses::Messages &res) { [this](const mtx::responses::Messages &res) {
if (cache::client()->previousBatchToken(room_id_) == res.end) if (cache::client()->previousBatchToken(room_id_) == res.end) {
noMoreMessages = true; noMoreMessages = true;
emit fetchedMore();
return;
}
uint64_t newFirst = cache::client()->saveOldMessages(room_id_, res); uint64_t newFirst = cache::client()->saveOldMessages(room_id_, res);
if (newFirst == first) if (newFirst == first)