From 011f649cbfc559e181ed094b47b23cf8026244b1 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 22 May 2021 14:14:58 +0200 Subject: [PATCH] Revert "Fix showing multiple deleted messages from the same author" This reverts commit b48c9bdadcc045284a135d6f1b284426a9f3a2f4. --- src/messageeventmodel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp index 59ffbd037..88f25e74c 100644 --- a/src/messageeventmodel.cpp +++ b/src/messageeventmodel.cpp @@ -665,8 +665,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const if (role == ShowAuthorRole) { for (auto r = row + 1; r < rowCount(); ++r) { auto i = index(r); - return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) != data(idx, EventTypeRole) - || data(idx, TimeRole).toDateTime().msecsTo(data(i, TimeRole).toDateTime()) > 600000; + if (data(i, SpecialMarksRole) != EventStatus::Hidden) { + return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) != data(idx, EventTypeRole) + || data(idx, TimeRole).toDateTime().msecsTo(data(i, TimeRole).toDateTime()) > 600000; + } } return true;