From f7025ba3b2eae45cbc8c4b3798c9751208789ca7 Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Mon, 9 Nov 2020 10:48:51 +0300
Subject: [PATCH] Restore media grouping options for quoted forward

They aren't working for photos, but work fine for files.
---
 Telegram/SourceFiles/boxes/share_box.cpp        | 8 +-------
 Telegram/SourceFiles/history/history_widget.cpp | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index b0acbab25..f407a3b57 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -531,9 +531,6 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
 		}
 		if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
 			_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
-				if (cForwardQuoted()) {
-					cSetForwardQuoted(false);
-				}
 				cSetForwardAlbumsAsIs(false);
 				cSetForwardGrouped(true);
 				updateAdditionalTitle();
@@ -541,9 +538,6 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
 		}
 		if (cForwardAlbumsAsIs() || cForwardGrouped()) {
 			_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
-				if (cForwardQuoted()) {
-					cSetForwardQuoted(false);
-				}
 				cSetForwardAlbumsAsIs(false);
 				cSetForwardGrouped(false);
 				updateAdditionalTitle();
@@ -572,7 +566,7 @@ void ShareBox::updateAdditionalTitle() {
 			: tr::ktg_forward_subtitle_uncaptioned(tr::now));
 	}
 
-	if (!cForwardQuoted() && _hasMediaMessages && !cForwardAlbumsAsIs()) {
+	if (_hasMediaMessages && !cForwardAlbumsAsIs()) {
 		if (!result.isEmpty()) {
 			result += ", ";
 		}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7b512afd0..0be03c172 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5307,9 +5307,6 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
 				}
 				if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
 					_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
-						if (cForwardQuoted()) {
-							cSetForwardQuoted(false);
-						}
 						cSetForwardAlbumsAsIs(false);
 						cSetForwardGrouped(true);
 						updateForwardingTexts();
@@ -5317,9 +5314,6 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
 				}
 				if (cForwardAlbumsAsIs() || cForwardGrouped()) {
 					_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
-						if (cForwardQuoted()) {
-							cSetForwardQuoted(false);
-						}
 						cSetForwardAlbumsAsIs(false);
 						cSetForwardGrouped(false);
 						updateForwardingTexts();
@@ -6618,7 +6612,7 @@ void HistoryWidget::updateForwardingTexts() {
 					: qsl(", ") + (cForwardCaptioned()
 						? tr::ktg_forward_subtitle_unquoted(tr::now)
 						: tr::ktg_forward_subtitle_uncaptioned(tr::now)))
-				+ (cForwardQuoted() || cForwardAlbumsAsIs() || !hasMediaToGroup
+				+ (cForwardAlbumsAsIs() || !hasMediaToGroup
 					? QString()
 					: qsl(", ") + (cForwardGrouped()
 						? tr::ktg_forward_subtitle_group_all_media(tr::now)