From be7d25ed22abd07a254bfb8ff6c30de4fcc79e6a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 5 Nov 2018 07:54:29 +0900 Subject: isEchoEvent: check the pending event for ids, not the synced one Synced events always have their event ids, so checking those for event id renders most of the function useless (and returns an incorrect result). Closes #248. --- lib/room.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/room.cpp b/lib/room.cpp index 9cdacd91..cd4d4dca 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -1300,15 +1300,15 @@ bool isEchoEvent(const RoomEventPtr& le, const PendingEventItem& re) if (le->type() != re->type()) return false; - if (!le->id().isEmpty()) + if (!re->id().isEmpty()) return le->id() == re->id(); - if (!le->transactionId().isEmpty()) + if (!re->transactionId().isEmpty()) return le->transactionId() == re->transactionId(); // This one is not reliable (there can be two unsynced // events with the same type, sender and state key) but // it's the best we have for state events. - if (le->isStateEvent()) + if (re->isStateEvent()) return le->stateKey() == re->stateKey(); // Empty id and no state key, hmm... (shrug) -- cgit v1.2.3