From 1c13f2587ced8958a106bc368c81d073300b2675 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 7 Jun 2022 13:49:30 +0300
Subject: [PATCH] Fixed display of bottom info in media with overridden edited
 date.

---
 .../SourceFiles/history/view/history_view_bottom_info.cpp   | 6 ++----
 Telegram/SourceFiles/history/view/history_view_element.cpp  | 4 ----
 Telegram/SourceFiles/history/view/history_view_element.h    | 1 -
 Telegram/SourceFiles/history/view/history_view_message.cpp  | 4 ----
 Telegram/SourceFiles/history/view/history_view_message.h    | 1 -
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
index d8a54d68b..49057809e 100644
--- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp
@@ -602,10 +602,8 @@ BottomInfo::Data BottomInfoDataFromMessage(not_null<Message*> message) {
 			result.author = msgsigned->author;
 		 }
 	}
-	if (!item->hideEditedBadge()) {
-		if (const auto edited = message->displayedEditBadge()) {
-			result.flags |= Flag::Edited;
-		}
+	if (message->displayedEditDate()) {
+		result.flags |= Flag::Edited;
 	}
 	if (const auto views = item->Get<HistoryMessageViews>()) {
 		if (views->views.count >= 0) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 15ae45fab..a18760ca0 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -869,10 +869,6 @@ ClickHandlerPtr Element::rightActionLink() const {
 	return ClickHandlerPtr();
 }
 
-bool Element::displayEditedBadge() const {
-	return false;
-}
-
 TimeId Element::displayedEditDate() const {
 	return TimeId(0);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 2bf5c29d4..5a9a6d62b 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -380,7 +380,6 @@ public:
 		int top,
 		int outerWidth) const;
 	[[nodiscard]] virtual ClickHandlerPtr rightActionLink() const;
-	[[nodiscard]] virtual bool displayEditedBadge() const;
 	[[nodiscard]] virtual TimeId displayedEditDate() const;
 	[[nodiscard]] virtual bool hasVisibleText() const;
 	[[nodiscard]] virtual HistoryMessageReply *displayedReply() const;
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index f525acddb..7c877c80e 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -3073,10 +3073,6 @@ void Message::refreshInfoSkipBlock() {
 	}
 }
 
-bool Message::displayEditedBadge() const {
-	return (displayedEditDate() != TimeId(0));
-}
-
 TimeId Message::displayedEditDate() const {
 	const auto item = message();
 	const auto overrided = media() && media()->overrideEditedDate();
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index fa95da1c9..1bbf929d2 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -118,7 +118,6 @@ public:
 		int top,
 		int outerWidth) const override;
 	[[nodiscard]] ClickHandlerPtr rightActionLink() const override;
-	[[nodiscard]] bool displayEditedBadge() const override;
 	[[nodiscard]] TimeId displayedEditDate() const override;
 	[[nodiscard]] HistoryMessageReply *displayedReply() const override;
 	[[nodiscard]] bool toggleSelectionByHandlerClick(