From 745bbfe268e696bd6c0aa0de649325c22e9d8f2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Sep 2020 21:04:08 +0300
Subject: [PATCH] Fix fast reply from message corner in Replies section.

---
 .../history/view/history_view_replies_section.cpp         | 8 ++++++++
 .../history/view/history_view_replies_section.h           | 1 +
 Telegram/SourceFiles/mainwidget.cpp                       | 5 +++--
 Telegram/SourceFiles/window/section_widget.h              | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index c2571a98a8..00977a96ca 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1427,6 +1427,14 @@ bool RepliesWidget::showMessage(
 	return true;
 }
 
+bool RepliesWidget::replyToMessage(not_null<HistoryItem*> item) {
+	if (item->history() != _history || item->replyToTop() != _rootId) {
+		return false;
+	}
+	_composeControls->replyToMessage(item->fullId());
+	return true;
+}
+
 void RepliesWidget::saveState(not_null<RepliesMemento*> memento) {
 	memento->setReplies(_replies);
 	memento->setReplyReturns(_replyReturns);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 88d6d2aab0..e58c9e8cdf 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -88,6 +88,7 @@ public:
 		PeerId peerId,
 		const Window::SectionShow &params,
 		MsgId messageId) override;
+	bool replyToMessage(not_null<HistoryItem*> item) override;
 
 	void setInternalState(
 		const QRect &geometry,
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 87bb87e8d9..34257e3dda 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -534,8 +534,9 @@ bool MainWidget::shareUrl(
 }
 
 void MainWidget::replyToItem(not_null<HistoryItem*> item) {
-	if (_history->peer() == item->history()->peer
-		|| _history->peer() == item->history()->peer->migrateTo()) {
+	if ((!_mainSection || !_mainSection->replyToMessage(item))
+		&& (_history->peer() == item->history()->peer
+			|| _history->peer() == item->history()->peer->migrateTo())) {
 		_history->replyToMessage(item);
 	}
 }
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 68a0790365..6d5f3b7fdc 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -125,6 +125,10 @@ public:
 		return false;
 	}
 
+	virtual bool replyToMessage(not_null<HistoryItem*> item) {
+		return false;
+	}
+
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
 	virtual std::unique_ptr<SectionMemento> createMemento();