From 64aa5480ad993a2f7a88b9eb0bc40b50a6198824 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 8 Oct 2021 04:31:08 +0300 Subject: [PATCH] Fixed display edited badge in scheduled albums. Moved hideEditedBadge from HistoryMessage to HistoryItem. --- Telegram/SourceFiles/history/history_item.h | 3 +++ Telegram/SourceFiles/history/history_message.h | 4 ---- .../history/view/media/history_view_media_grouped.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index f6729b90b..29b9825f0 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -227,6 +227,9 @@ public: [[nodiscard]] bool hasFailed() const { return _flags & MessageFlag::SendingFailed; } + [[nodiscard]] bool hideEditedBadge() const { + return (_flags & MessageFlag::HideEdited); + } void sendFailed(); [[nodiscard]] virtual int viewsCount() const { return hasViews() ? 1 : -1; diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h index 3df1944a5..072a4eebe 100644 --- a/Telegram/SourceFiles/history/history_message.h +++ b/Telegram/SourceFiles/history/history_message.h @@ -128,10 +128,6 @@ public: [[nodiscard]] bool allowsEdit(TimeId now) const override; [[nodiscard]] bool uploading() const; - [[nodiscard]] bool hideEditedBadge() const { - return (_flags & MessageFlag::HideEdited); - } - void setViewsCount(int count) override; void setForwardsCount(int count) override; void setReplies(HistoryMessageRepliesData &&data) override; diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp index 0d9e11984..17db7e446 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp @@ -638,8 +638,10 @@ DocumentData *GroupedMedia::getDocument() const { HistoryMessageEdited *GroupedMedia::displayedEditBadge() const { for (const auto &part : _parts) { - if (const auto edited = part.item->Get()) { - return edited; + if (!part.item->hideEditedBadge()) { + if (const auto edited = part.item->Get()) { + return edited; + } } } return nullptr;