From 6d670e1c72eb5deba241c8484fc31665c48cb660 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 12 Dec 2017 10:20:47 +0900 Subject: Deduplicate events within a batch Closes #130. --- room.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/room.cpp b/room.cpp index 7f4d7684..6e4cfbbd 100644 --- a/room.cpp +++ b/room.cpp @@ -460,8 +460,8 @@ void Room::Private::insertEvent(RoomEvent* e, Timeline::iterator where, if (eventsIndex.contains(e->id())) { qCWarning(MAIN) << "Event" << e->id() << "is already in the timeline."; - qCWarning(MAIN) << "Either dropDuplicateEvents() wasn't called or duplicate " - "events within the same batch arrived from the server."; + qCWarning(MAIN) + << "Room::dropDuplicateEvents() wasn't called or has a bug."; return; } timeline.emplace(where, e, index); @@ -680,10 +680,30 @@ void Room::redactEvent(const QString& eventId, const QString& reason) void Room::Private::dropDuplicateEvents(RoomEvents* events) const { + if (events->empty()) + return; + // Collect all duplicate events at the end of the container auto dupsBegin = std::stable_partition(events->begin(), events->end(), [&] (RoomEvent* e) { return !eventsIndex.contains(e->id()); }); + + if (dupsBegin != events->begin()) + { + // Check the batch itself for dups + auto eIt = events->begin(); + for (auto baseId = (*eIt)->id(); ++eIt < dupsBegin; baseId = (*eIt)->id()) + { + dupsBegin = + std::stable_partition(eIt, dupsBegin, + [&] (const RoomEvent* e) { return e->id() != baseId; }); + } + } + if (dupsBegin == events->end()) + return; + + qCDebug(EVENTS) << "Dropping" << distance(dupsBegin, events->end()) + << "duplicate event(s)"; // Dispose of those dups std::for_each(dupsBegin, events->end(), [] (Event* e) { delete e; }); events->erase(dupsBegin, events->end()); -- cgit v1.2.3