From 428a3cf0cea0cafa23baae1cc6f0ed66b68c4ef1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 31 Jan 2025 14:45:06 +0400
Subject: [PATCH] Improve phrases for forward-from-saved.

---
 .../view/controls/history_view_draft_options.cpp      |  3 ++-
 .../view/controls/history_view_forward_panel.cpp      | 11 ++++++++++-
 .../view/controls/history_view_forward_panel.h        |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index 212840323..2d03f6dfa 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -947,7 +947,8 @@ void DraftOptionsBox(
 
 		AddFilledSkip(bottom);
 
-		if (!hasOnlyForcedForwardedInfo) {
+		if (!hasOnlyForcedForwardedInfo
+			&& !HasOnlyDroppedForwardedInfo(items)) {
 			Settings::AddButtonWithIcon(
 				bottom,
 				(dropNames
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index 239108e13..022b124ab 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -153,7 +153,7 @@ void ForwardPanel::updateTexts() {
 				Unexpected("Corrupt forwarded information in message.");
 			}
 		}
-		if (!keepNames) {
+		if (!keepNames || HasOnlyDroppedForwardedInfo(_data.items)) {
 			from = tr::lng_forward_sender_names_removed(tr::now);
 		} else if (names.size() > 2) {
 			from = tr::lng_forwarding_from(
@@ -445,4 +445,13 @@ bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list) {
 	return true;
 }
 
+bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (!item->computeDropForwardedInfo()) {
+			return false;
+		}
+	}
+	return true;
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
index 133292ceb..54624d47d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
@@ -85,5 +85,6 @@ void EditWebPageOptions(
 	Fn<void(Data::WebPageDraft)> done);
 
 [[nodiscard]] bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list);
+[[nodiscard]] bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list);
 
 } // namespace HistoryView::Controls