mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #713 from Thulinma/noMoreDuplicates

Browse Source 
Fixed duplicate messages appearing in timeline if server sent them
pull/714/head
DeepBlueV7.X 3 years ago committed by GitHub
parent 70e20f5d10 2525579610
commit d30401c3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 59
      src/Cache.cpp

59
src/Cache.cpp
Unescape View File

@ -2999,24 +2999,31 @@ Cache::saveTimelineMessages(lmdb::txn &txn,
eventsDb.put(txn, redaction->redacts, event.dump()); eventsDb.put(txn, redaction->redacts, event.dump());
eventsDb.put(txn, redaction->event_id, json(*redaction).dump()); eventsDb.put(txn, redaction->event_id, json(*redaction).dump());
} else { } else {
eventsDb.put(txn, event_id, event.dump());
++index;
first = false; first = false;
nhlog::db()->debug("saving '{}'", orderEntry.dump()); // This check protects against duplicates in the timeline. If the event_id
// is already in the DB, we skip putting it (again) in ordered DBs, and only
// update the event itself and its relations.
std::string_view unused_read;
if (!eventsDb.get(txn, event_id, unused_read)) {
++index;
cursor.put(lmdb::to_sv(index), orderEntry.dump(), MDB_APPEND); nhlog::db()->debug("saving '{}'", orderEntry.dump());
evToOrderDb.put(txn, event_id, lmdb::to_sv(index));
// TODO(Nico): Allow blacklisting more event types in UI cursor.put(lmdb::to_sv(index), orderEntry.dump(), MDB_APPEND);
if (!isHiddenEvent(txn, e, room_id)) { evToOrderDb.put(txn, event_id, lmdb::to_sv(index));
++msgIndex;
msgCursor.put(lmdb::to_sv(msgIndex), event_id, MDB_APPEND);
msg2orderDb.put(txn, event_id, lmdb::to_sv(msgIndex)); // TODO(Nico): Allow blacklisting more event types in UI
if (!isHiddenEvent(txn, e, room_id)) {
++msgIndex;
msgCursor.put(lmdb::to_sv(msgIndex), event_id, MDB_APPEND);
msg2orderDb.put(txn, event_id, lmdb::to_sv(msgIndex));
}
} else {
nhlog::db()->warn("duplicate event '{}'", orderEntry.dump());
} }
eventsDb.put(txn, event_id, event.dump());
auto relations = mtx::accessors::relations(e); auto relations = mtx::accessors::relations(e);
if (!relations.relations.empty()) { if (!relations.relations.empty()) {
@ -3078,23 +3085,29 @@ Cache::saveOldMessages(const std::string &room_id, const mtx::responses::Message
auto event = mtx::accessors::serialize_event(e); auto event = mtx::accessors::serialize_event(e);
event_id_val = event["event_id"].get<std::string>(); event_id_val = event["event_id"].get<std::string>();
std::string_view event_id = event_id_val; std::string_view event_id = event_id_val;
eventsDb.put(txn, event_id, event.dump());
--index; // This check protects against duplicates in the timeline. If the event_id is
// already in the DB, we skip putting it (again) in ordered DBs, and only update the
// event itself and its relations.
std::string_view unused_read;
if (!eventsDb.get(txn, event_id, unused_read)) {
--index;
json orderEntry = json::object(); json orderEntry = json::object();
orderEntry["event_id"] = event_id_val; orderEntry["event_id"] = event_id_val;
orderDb.put(txn, lmdb::to_sv(index), orderEntry.dump()); orderDb.put(txn, lmdb::to_sv(index), orderEntry.dump());
evToOrderDb.put(txn, event_id, lmdb::to_sv(index)); evToOrderDb.put(txn, event_id, lmdb::to_sv(index));
// TODO(Nico): Allow blacklisting more event types in UI // TODO(Nico): Allow blacklisting more event types in UI
if (!isHiddenEvent(txn, e, room_id)) { if (!isHiddenEvent(txn, e, room_id)) {
--msgIndex; --msgIndex;
order2msgDb.put(txn, lmdb::to_sv(msgIndex), event_id); order2msgDb.put(txn, lmdb::to_sv(msgIndex), event_id);
msg2orderDb.put(txn, event_id, lmdb::to_sv(msgIndex)); msg2orderDb.put(txn, event_id, lmdb::to_sv(msgIndex));
}
} }
eventsDb.put(txn, event_id, event.dump());
auto relations = mtx::accessors::relations(e); auto relations = mtx::accessors::relations(e);
if (!relations.relations.empty()) { if (!relations.relations.empty()) {

Write Preview
Loading…
Cancel
Save