Move unread mentions menu to chat_helpers/send_context_menu.

Telegram/SourceFiles/chat_helpers/send_context_menu.cpp

@@ -14,6 +14,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_schedule_box.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/popup_menu.h"
+#include "data/data_peer.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
 
 #include <QtWidgets/QApplication>
 
@@ -133,4 +136,45 @@ void SetupMenuAndShortcuts(
 	}, button->lifetime());
 }
 
+void SetupUnreadMentionsMenu(
+		not_null<Ui::RpWidget*> button,
+		Fn<PeerData*()> currentPeer) {
+	struct State {
+		base::unique_qptr<Ui::PopupMenu> menu;
+		base::flat_set<not_null<PeerData*>> sentForPeers;
+	};
+	const auto state = std::make_shared<State>();
+	const auto showMenu = [=] {
+		const auto peer = currentPeer();
+		if (!peer) {
+			return;
+		}
+		state->menu = base::make_unique_q<Ui::PopupMenu>(button);
+		const auto text = tr::lng_context_mark_read_mentions_all(tr::now);
+		state->menu->addAction(text, [=] {
+			if (!state->sentForPeers.emplace(peer).second) {
+				return;
+			}
+			peer->session().api().request(MTPmessages_ReadMentions(
+				peer->input
+			)).done([=](const MTPmessages_AffectedHistory &result) {
+				state->sentForPeers.remove(peer);
+				peer->session().api().applyAffectedHistory(peer, result);
+			}).fail([=](const MTP::Error &error) {
+				state->sentForPeers.remove(peer);
+			}).send();
+		});
+		state->menu->popup(QCursor::pos());
+	};
+
+	base::install_event_filter(button, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			showMenu();
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+
+}
+
 } // namespace SendMenu

Telegram/SourceFiles/chat_helpers/send_context_menu.h

@@ -50,4 +50,8 @@ void SetupMenuAndShortcuts(
 	Fn<void()> silent,
 	Fn<void()> schedule);
 
+void SetupUnreadMentionsMenu(
+	not_null<Ui::RpWidget*> button,
+	Fn<PeerData*()> currentPeer);
+
 } // namespace SendMenu

Telegram/SourceFiles/history/history_widget.cpp

@@ -309,7 +309,9 @@ HistoryWidget::HistoryWidget(
 
 	_historyDown->installEventFilter(this);
 	_unreadMentions->installEventFilter(this);
-	setupUnreadMentionsButtonContextMenu(_unreadMentions.data());
+	SendMenu::SetupUnreadMentionsMenu(_unreadMentions.data(), [=] {
+		return _history ? _history->peer.get() : nullptr;
+	});
 
 	InitMessageField(controller, _field);
 
@@ -6965,42 +6967,6 @@ void HistoryWidget::synteticScrollToY(int y) {
 	_synteticScrollEvent = false;
 }
 
-void HistoryWidget::setupUnreadMentionsButtonContextMenu(
-		not_null<Ui::RpWidget*> button) {
-	struct State {
-		base::unique_qptr<Ui::PopupMenu> menu;
-		base::flat_set<not_null<PeerData*>> sentForPeers;
-	};
-	const auto state = std::make_shared<State>();
-	const auto showMenu = [=] {
-		state->menu = base::make_unique_q<Ui::PopupMenu>(button);
-		const auto text = tr::lng_context_mark_read_mentions_all(tr::now);
-		const auto peer = _history->peer;
-		state->menu->addAction(text, [=] {
-			if (!state->sentForPeers.emplace(peer).second) {
-				return;
-			}
-			peer->session().api().request(MTPmessages_ReadMentions(
-				peer->input
-			)).done([=](const MTPmessages_AffectedHistory &result) {
-				state->sentForPeers.remove(peer);
-				peer->session().api().applyAffectedHistory(peer, result);
-			}).fail([=](const MTP::Error &error) {
-				state->sentForPeers.remove(peer);
-			}).send();
-		});
-		state->menu->popup(QCursor::pos());
-	};
-
-	base::install_event_filter(button, [=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::ContextMenu) {
-			showMenu();
-			return base::EventFilterResult::Cancel;
-		}
-		return base::EventFilterResult::Continue;
-	});
-}
-
 HistoryWidget::~HistoryWidget() {
 	if (_history) {
 		// Saving a draft on account switching.

Telegram/SourceFiles/history/history_widget.h

@@ -597,8 +597,6 @@ private:
 
 	bool kbWasHidden() const;
 
-	void setupUnreadMentionsButtonContextMenu(not_null<Ui::RpWidget*> button);
-
 	MTP::Sender _api;
 	MsgId _replyToId = 0;
 	Ui::Text::String _replyToName;