From dd92f7fb9d00808e5c558f832d0dc2b308ee9312 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 9 Dec 2021 08:24:47 +0300 Subject: [PATCH] Slightly refactored AddContactBox. --- .../SourceFiles/boxes/add_contact_box.cpp | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index 43fa0abb4..da5444c8c 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -418,32 +418,34 @@ void AddContactBox::save() { MTP_string(lastName))) )).done(crl::guard(this, [=]( const MTPcontacts_ImportedContacts &result) { - result.match([&](const MTPDcontacts_importedContacts &data) { - _session->data().processUsers(data.vusers()); - - const auto extractUser = [&](const MTPImportedContact &data) { - return data.match([&](const MTPDimportedContact &data) { - return (data.vclient_id().v == _contactId) - ? _session->data().userLoaded(data.vuser_id()) - : nullptr; - }); - }; - const auto &list = data.vimported().v; - const auto user = list.isEmpty() - ? nullptr - : extractUser(list.front()); - if (user) { - if (user->isContact() || user->session().supportMode()) { - Ui::showPeerHistory(user, ShowAtTheEndMsgId); - } - Ui::hideLayer(); - } else if (isBoxShown()) { - hideChildren(); - _retrying = true; - updateButtons(); - update(); - } + const auto &data = result.match([]( + const auto &data) -> const MTPDcontacts_importedContacts& { + return data; }); + _session->data().processUsers(data.vusers()); + + const auto extractUser = [&](const MTPImportedContact &data) { + return data.match([&](const MTPDimportedContact &data) { + return (data.vclient_id().v == _contactId) + ? _session->data().userLoaded(data.vuser_id()) + : nullptr; + }); + }; + const auto &list = data.vimported().v; + const auto user = list.isEmpty() + ? nullptr + : extractUser(list.front()); + if (user) { + if (user->isContact() || user->session().supportMode()) { + Ui::showPeerHistory(user, ShowAtTheEndMsgId); + } + Ui::hideLayer(); + } else if (isBoxShown()) { + hideChildren(); + _retrying = true; + updateButtons(); + update(); + } })).send(); }