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

Try to fix duplicate messages in certain edge cases (i.e. sync and pagination at the same time)

This commit is contained in:
Nicolas Werner 2019-09-09 20:33:22 +02:00
parent f260b8b4ae
commit 4efac5a247
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/timeline2/TimelineModel.cpp
View File

@ -324,10 +324,16 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
QString id = QString id =
boost::apply_visitor([](const auto &e) -> QString { return eventId(e); }, e); boost::apply_visitor([](const auto &e) -> QString { return eventId(e); }, e);
if (this->events.contains(id))
continue;
this->events.insert(id, e); this->events.insert(id, e);
ids.push_back(id); ids.push_back(id);
} }
if (ids.empty)
return;
beginInsertRows(QModelIndex(), beginInsertRows(QModelIndex(),
static_cast<int>(this->eventOrder.size()), static_cast<int>(this->eventOrder.size()),
static_cast<int>(this->eventOrder.size() + ids.size() - 1)); static_cast<int>(this->eventOrder.size() + ids.size() - 1));
@ -372,13 +378,18 @@ TimelineModel::addBackwardsEvents(const mtx::responses::Messages &msgs)
QString id = QString id =
boost::apply_visitor([](const auto &e) -> QString { return eventId(e); }, e); boost::apply_visitor([](const auto &e) -> QString { return eventId(e); }, e);
if (this->events.contains(id))
continue;
this->events.insert(id, e); this->events.insert(id, e);
ids.push_back(id); ids.push_back(id);
} }
if (!ids.empty()) {
beginInsertRows(QModelIndex(), 0, static_cast<int>(ids.size() - 1)); beginInsertRows(QModelIndex(), 0, static_cast<int>(ids.size() - 1));
this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend()); this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend());
endInsertRows(); endInsertRows();
}
prev_batch_token_ = QString::fromStdString(msgs.end); prev_batch_token_ = QString::fromStdString(msgs.end);