From 14e57e78333d96704bf7ebc8d97dd350654e7d89 Mon Sep 17 00:00:00 2001 From: James Graham Date: Sat, 3 Sep 2022 14:33:58 +0000 Subject: [PATCH] Fix show author after state regression The avatar should be shown after a state message Fixes network/neochat#553 --- src/messageeventmodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp index 4883f744a..65c0001d4 100644 --- a/src/messageeventmodel.cpp +++ b/src/messageeventmodel.cpp @@ -715,7 +715,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const for (auto r = row + 1; r < rowCount(); ++r) { auto i = index(r); if (data(i, SpecialMarksRole) != EventStatus::Hidden) { - return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000 + return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) == "state" + || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000 || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day(); } }