From 89a3462824d7513a2877c78649137db448f1f0b8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 10 Jul 2022 17:59:52 +0300
Subject: [PATCH] Simplified extracting of data from some MTP* responses.

---
 Telegram/SourceFiles/api/api_bot.cpp                |  5 +----
 Telegram/SourceFiles/boxes/add_contact_box.cpp      |  5 +----
 Telegram/SourceFiles/boxes/gift_premium_box.cpp     | 13 +++----------
 .../SourceFiles/data/data_sponsored_messages.cpp    |  5 +----
 .../history/admin_log/history_admin_log_inner.cpp   |  5 +----
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index 10725c8e60..3ffc33155d 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -100,10 +100,7 @@ void SendBotCallbackData(
 			button->requestId = 0;
 			owner->requestItemRepaint(item);
 		}
-		const auto &data = result.match([](
-				const auto &data) -> const MTPDmessages_botCallbackAnswer& {
-			return data;
-		});
+		const auto &data = result.data();
 		const auto message = data.vmessage()
 			? qs(*data.vmessage())
 			: QString();
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index a79dbcecd7..87ce676f82 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -379,10 +379,7 @@ void AddContactBox::save() {
 				MTP_string(lastName)))
 	)).done(crl::guard(weak, [=](
 			const MTPcontacts_ImportedContacts &result) {
-		const auto &data = result.match([](
-				const auto &data) -> const MTPDcontacts_importedContacts& {
-			return data;
-		});
+		const auto &data = result.data();
 		session->data().processUsers(data.vusers());
 		if (!weak) {
 			return;
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 1827f266c3..e36797366e 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -364,17 +364,10 @@ void GiftPremiumValidator::showBox(not_null<UserData*> user) {
 		}
 		_requestId = 0;
 //		_controller->api().processFullPeer(peer, result);
-		const auto &data = result.match([](
-				const MTPDusers_userFull &d) -> const MTPDusers_userFull & {
-			return d;
-		});
-		_controller->session().data().processUsers(data.vusers());
-		_controller->session().data().processChats(data.vchats());
+		_controller->session().data().processUsers(result.data().vusers());
+		_controller->session().data().processChats(result.data().vchats());
 
-		const auto &fullUser = data.vfull_user().match(
-				[](const MTPDuserFull &d) -> const MTPDuserFull & {
-			return d;
-		});
+		const auto &fullUser = result.data().vfull_user().data();
 		auto options = GiftOptionFromTL(
 			fullUser,
 			_controller->session().api().premium().monthlyAmount(),
diff --git a/Telegram/SourceFiles/data/data_sponsored_messages.cpp b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
index 9b490701f2..fa9182ee7b 100644
--- a/Telegram/SourceFiles/data/data_sponsored_messages.cpp
+++ b/Telegram/SourceFiles/data/data_sponsored_messages.cpp
@@ -146,10 +146,7 @@ void SponsoredMessages::append(
 		not_null<History*> history,
 		List &list,
 		const MTPSponsoredMessage &message) {
-	const auto &data = message.match([](
-			const auto &data) -> const MTPDsponsoredMessage& {
-		return data;
-	});
+	const auto &data = message.data();
 	const auto randomId = data.vrandom_id().v;
 	const auto hash = qs(data.vchat_invite_hash().value_or_empty());
 	const auto makeFrom = [&](
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index 17201f416e..9ba316fab5 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -818,10 +818,7 @@ void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLo
 		: newItemsForDownDirection;
 	addToItems.reserve(oldItemsCount + events.size() * 2);
 	for (const auto &event : events) {
-		const auto &data = event.match([](const MTPDchannelAdminLogEvent &d)
-				-> const MTPDchannelAdminLogEvent & {
-			return d;
-		});
+		const auto &data = event.data();
 		const auto id = data.vid().v;
 		if (_eventIds.find(id) != _eventIds.end()) {
 			return;