From 193e454fd4c526c49d31ee47274bc277d5d44beb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Feb 2019 14:43:46 +0300
Subject: [PATCH] Fixed sending polls as reply to other messages. Fixes #5550.

---
 Telegram/SourceFiles/apiwrap.cpp                 |  5 +++++
 Telegram/SourceFiles/mainwidget.cpp              |  9 +++++++++
 Telegram/SourceFiles/mainwidget.h                |  2 ++
 Telegram/SourceFiles/window/window_peer_menu.cpp | 10 +++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 8f7b16f22..12b8be525 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -5437,6 +5437,11 @@ void ApiWrap::createPoll(
 	if (options.replyTo) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
+	if (options.clearDraft) {
+		sendFlags |= MTPmessages_SendMedia::Flag::f_clear_draft;
+		history->clearLocalDraft();
+		history->clearCloudDraft();
+	}
 	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
 	const auto silentPost = channelPost
 		&& _session->data().notifySilentPosts(peer);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 01b79d23f..ec6a2f16e 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1118,6 +1118,15 @@ bool MainWidget::historyInSelectionMode() const {
 	return _history->inSelectionMode();
 }
 
+MsgId MainWidget::currentReplyToIdFor(not_null<History*> history) const {
+	if (_history->history() == history) {
+		return _history->replyToId();
+	} else if (const auto localDraft = history->localDraft()) {
+		return localDraft->msgId;
+	}
+	return 0;
+}
+
 void MainWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo) {
 	_history->sendBotCommand(peer, bot, cmd, replyTo);
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 469ce7eae..cfb456e2b 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -217,6 +217,8 @@ public:
 	TimeMs highlightStartTime(not_null<const HistoryItem*> item) const;
 	bool historyInSelectionMode() const;
 
+	MsgId currentReplyToIdFor(not_null<History*> history) const;
+
 	void sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo);
 	void hideSingleUseKeyboard(PeerData *peer, MsgId replyTo);
 	bool insertBotCommand(const QString &cmd);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 896deea1f..48156dc84 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_poll.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_drafts.h"
 #include "data/data_user.h"
 #include "dialogs/dialogs_key.h"
 
@@ -636,7 +637,14 @@ void PeerMenuCreatePoll(not_null<PeerData*> peer) {
 		if (std::exchange(*lock, true)) {
 			return;
 		}
-		const auto options = ApiWrap::SendOptions(peer->owner().history(peer));
+		auto options = ApiWrap::SendOptions(peer->owner().history(peer));
+		if (const auto id = App::main()->currentReplyToIdFor(options.history)) {
+			options.replyTo = id;
+		}
+		if (const auto localDraft = options.history->localDraft()) {
+			options.clearDraft = localDraft->textWithTags.text.isEmpty();
+		}
+
 		Auth().api().createPoll(result, options, crl::guard(box, [=] {
 			box->closeBox();
 		}), crl::guard(box, [=](const RPCError &error) {