diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp index a360d8e787..143166b78a 100644 --- a/Telegram/SourceFiles/api/api_authorizations.cpp +++ b/Telegram/SourceFiles/api/api_authorizations.cpp @@ -194,7 +194,7 @@ void Authorizations::updateTTL(int days) { _api.request(_ttlRequestId).cancel(); _ttlRequestId = _api.request(MTPaccount_SetAuthorizationTTL( MTP_int(days) - )).done([=](const MTPBool &result) { + )).done([=] { _ttlRequestId = 0; }).fail([=] { _ttlRequestId = 0; @@ -216,7 +216,7 @@ void Authorizations::toggleCallsDisabled(uint64 hash, bool disabled) { MTP_long(hash), MTPBool(), // encrypted_requests_disabled MTP_bool(disabled) - )).done([=](const MTPBool &) { + )).done([=] { _toggleCallsDisabledRequests.remove(hash); }).fail([=] { _toggleCallsDisabledRequests.remove(hash); diff --git a/Telegram/SourceFiles/api/api_blocked_peers.cpp b/Telegram/SourceFiles/api/api_blocked_peers.cpp index 56ec63062a..c28b9c37f2 100644 --- a/Telegram/SourceFiles/api/api_blocked_peers.cpp +++ b/Telegram/SourceFiles/api/api_blocked_peers.cpp @@ -80,7 +80,7 @@ void BlockedPeers::block(not_null peer) { } else if (_blockRequests.find(peer) == end(_blockRequests)) { const auto requestId = _api.request(MTPcontacts_Block( peer->input - )).done([=](const MTPBool &result) { + )).done([=] { _blockRequests.erase(peer); peer->setIsBlocked(true); if (_slice) { @@ -109,7 +109,7 @@ void BlockedPeers::unblock(not_null peer, Fn onDone) { } const auto requestId = _api.request(MTPcontacts_Unblock( peer->input - )).done([=](const MTPBool &result) { + )).done([=] { _blockRequests.erase(peer); peer->setIsBlocked(false); if (_slice) { diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp index 559f16136f..0db1920217 100644 --- a/Telegram/SourceFiles/api/api_confirm_phone.cpp +++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp @@ -83,7 +83,7 @@ void ConfirmPhone::resolve( _checkRequestId = _api.request(MTPaccount_ConfirmPhone( MTP_string(phoneHash), MTP_string(code) - )).done([=](const MTPBool &result) { + )).done([=] { _checkRequestId = 0; controller->show( Box( diff --git a/Telegram/SourceFiles/api/api_invite_links.cpp b/Telegram/SourceFiles/api/api_invite_links.cpp index 8206c6bb4c..3aad8c14e5 100644 --- a/Telegram/SourceFiles/api/api_invite_links.cpp +++ b/Telegram/SourceFiles/api/api_invite_links.cpp @@ -363,7 +363,7 @@ void InviteLinks::destroy( _api->request(MTPmessages_DeleteExportedChatInvite( peer->input, MTP_string(link) - )).done([=](const MTPBool &result) { + )).done([=] { const auto callbacks = _deleteCallbacks.take(key); if (callbacks) { for (const auto &callback : *callbacks) { @@ -398,7 +398,7 @@ void InviteLinks::destroyAllRevoked( _api->request(MTPmessages_DeleteRevokedExportedChatInvites( peer->input, admin->inputUser - )).done([=](const MTPBool &result) { + )).done([=] { if (const auto callbacks = _deleteRevokedCallbacks.take(peer)) { for (const auto &callback : *callbacks) { callback(); diff --git a/Telegram/SourceFiles/api/api_self_destruct.cpp b/Telegram/SourceFiles/api/api_self_destruct.cpp index 6247f3037e..fb8497637e 100644 --- a/Telegram/SourceFiles/api/api_self_destruct.cpp +++ b/Telegram/SourceFiles/api/api_self_destruct.cpp @@ -40,7 +40,7 @@ void SelfDestruct::update(int days) { _api.request(_requestId).cancel(); _requestId = _api.request(MTPaccount_SetAccountTTL( MTP_accountDaysTTL(MTP_int(days)) - )).done([=](const MTPBool &result) { + )).done([=] { _requestId = 0; }).fail([=] { _requestId = 0; diff --git a/Telegram/SourceFiles/api/api_sensitive_content.cpp b/Telegram/SourceFiles/api/api_sensitive_content.cpp index d12084dbe0..e2d3e49edd 100644 --- a/Telegram/SourceFiles/api/api_sensitive_content.cpp +++ b/Telegram/SourceFiles/api/api_sensitive_content.cpp @@ -61,7 +61,7 @@ void SensitiveContent::update(bool enabled) { _api.request(_requestId).cancel(); _requestId = _api.request(MTPaccount_SetContentSettings( MTP_flags(enabled ? Flag::f_sensitive_enabled : Flag(0)) - )).done([=](const MTPBool &result) { + )).done([=] { _requestId = 0; }).fail([=] { _requestId = 0; diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp index aa764490b7..fb97541c21 100644 --- a/Telegram/SourceFiles/api/api_updates.cpp +++ b/Telegram/SourceFiles/api/api_updates.cpp @@ -919,7 +919,7 @@ void Updates::updateOnline(crl::time lastNonIdleTime, bool gotOtherOffline) { } else { _onlineRequest = api().request(MTPaccount_UpdateStatus( MTP_bool(!isOnline) - )).done([=](const MTPBool &result) { + )).done([=] { Core::App().quitPreventFinished(); }).fail([=] { Core::App().quitPreventFinished(); diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index b7567a5a42..cf4c75129f 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -333,7 +333,7 @@ void ApiWrap::requestTermsUpdate() { void ApiWrap::acceptTerms(bytes::const_span id) { request(MTPhelp_AcceptTermsOfService( MTP_dataJSON(MTP_bytes(id)) - )).done([=](const MTPBool &result) { + )).done([=] { requestTermsUpdate(); }).send(); } @@ -1478,7 +1478,7 @@ void ApiWrap::saveStickerSets( reorderRequestId() = request(MTPmessages_ReorderStickerSets( MTP_flags(flags), MTP_vector(mtpOrder) - )).done([=](const MTPBool &result) { + )).done([=] { reorderRequestId() = 0; }).fail([=] { reorderRequestId() = 0; @@ -1551,11 +1551,7 @@ void ApiWrap::saveStickerSets( }; requestId = request(MTPmessages_ClearRecentStickers( MTP_flags(flags) - )).done([=](const MTPBool &result) { - finish(); - }).fail([=] { - finish(); - }).send(); + )).done(finish).fail(finish).send(); continue; } @@ -2799,7 +2795,7 @@ void ApiWrap::readFeaturedSets() { if (!wrappedIds.empty()) { auto requestData = MTPmessages_ReadFeaturedStickers( MTP_vector(wrappedIds)); - request(std::move(requestData)).done([=](const MTPBool &result) { + request(std::move(requestData)).done([=] { local().writeFeaturedStickers(); _session->data().stickers().notifyUpdated(); }).send(); @@ -4056,7 +4052,7 @@ void ApiWrap::saveContactSignupSilent(bool silent) { const auto requestId = request(MTPaccount_SetContactSignUpNotification( MTP_bool(silent) - )).done([=](const MTPBool &) { + )).done([=] { _contactSignupSilentRequestId = 0; _contactSignupSilent = silent; _contactSignupSilentChanges.fire_copy(silent); diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index 09d4df8ab7..611df771c1 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -1112,7 +1112,7 @@ void SetupChannelBox::save() { _saveRequestId = _api.request(MTPchannels_UpdateUsername( _channel->inputChannel, MTP_string(_sentUsername) - )).done([=](const MTPBool &result) { + )).done([=] { _channel->setName( TextUtilities::SingleLine(_channel->name), _sentUsername); @@ -1604,7 +1604,7 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) { _revokeRequestId = _api.request(MTPchannels_UpdateUsername( pressed->asChannel()->inputChannel, MTP_string() - )).done([=, close = std::move(close)](const MTPBool &result) { + )).done([=, close = std::move(close)] { close(); if (const auto callback = _revokeCallback) { callback(); diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index 5d8ab1f287..46a9385fe4 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -546,7 +546,7 @@ void PasscodeBox::validateEmail( } _setRequest = _api.request(MTPaccount_ConfirmPasswordEmail( MTP_string(code) - )).done([=](const MTPBool &result) { + )).done([=] { *set = true; setPasswordDone(newPasswordBytes); }).fail([=](const MTP::Error &error) { @@ -575,7 +575,7 @@ void PasscodeBox::validateEmail( return; } _setRequest = _api.request(MTPaccount_ResendPasswordEmail( - )).done([=](const MTPBool &result) { + )).done([=] { _setRequest = 0; resent->fire(tr::lng_cloud_password_resent(tr::now)); }).fail([=] { @@ -830,7 +830,7 @@ void PasscodeBox::sendClearCloudPassword( MTP_string(hint), MTP_string(email), MTPSecureSecretSettings()) - )).done([=](const MTPBool &result) { + )).done([=] { setPasswordDone({}); }).fail([=](const MTP::Error &error) mutable { setPasswordFail({}, QString(), error); @@ -865,7 +865,7 @@ void PasscodeBox::setNewCloudPassword(const QString &newPassword) { _setRequest = _api.request(MTPaccount_UpdatePasswordSettings( MTP_inputCheckPasswordEmpty(), settings - )).done([=](const MTPBool &result) { + )).done([=] { setPasswordDone(newPasswordBytes); }).fail([=](const MTP::Error &error) { setPasswordFail(newPasswordBytes, email, error); @@ -972,7 +972,7 @@ void PasscodeBox::resetSecret( MTP_securePasswordKdfAlgoUnknown(), // secure_algo MTP_bytes(), // secure_secret MTP_long(0))) // secure_secret_id - )).done([=](const MTPBool &result) { + )).done([=] { _setRequest = 0; callback(); checkPasswordHash([=](const Core::CloudPasswordResult &check) { @@ -1026,7 +1026,7 @@ void PasscodeBox::sendChangeCloudPassword( Core::PrepareSecureSecretAlgo(_cloudFields.newSecureSecretAlgo), MTP_bytes(newSecureSecret), MTP_long(newSecureSecretId))) - )).done([=](const MTPBool &result) { + )).done([=] { setPasswordDone(newPasswordBytes); }).fail([=](const MTP::Error &error) { setPasswordFail(newPasswordBytes, QString(), error); @@ -1257,7 +1257,7 @@ void RecoverBox::submit() { // From "Change cloud password". _submitRequest = _api.request(MTPauth_CheckRecoveryPassword( MTP_string(code) - )).done([=](const MTPBool &result) { + )).done([=] { proceedToChange(code); }).fail([=](const MTP::Error &error) { checkSubmitFail(error); @@ -1378,7 +1378,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail( } *requestId = session->api().request(MTPaccount_ConfirmPasswordEmail( MTP_string(code) - )).done([=](const MTPBool &result) { + )).done([=] { *requestId = 0; reloads->fire({}); if (*weak) { @@ -1412,7 +1412,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail( return; } *requestId = session->api().request(MTPaccount_ResendPasswordEmail( - )).done([=](const MTPBool &result) { + )).done([=] { *requestId = 0; resent->fire(tr::lng_cloud_password_resent(tr::now)); }).fail([=] { diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp index ad09dde7d2..cd0c9df29a 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp @@ -101,7 +101,7 @@ void SaveChatAdmin( chat->inputChat, user->inputUser, MTP_bool(isAdmin) - )).done([=](const MTPBool &result) { + )).done([=] { chat->applyEditAdmin(user, isAdmin); if (onDone) { onDone(); diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 84fae3ba86..c9fca8adfa 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -1303,7 +1303,7 @@ void Controller::saveUsername() { _api.request(MTPchannels_UpdateUsername( channel->inputChannel, MTP_string(*_savingData.username) - )).done([=](const MTPBool &result) { + )).done([=] { channel->setName( TextUtilities::SingleLine(channel->name), *_savingData.username); @@ -1358,7 +1358,7 @@ void Controller::saveLinkedChat() { _api.request(MTPchannels_SetDiscussionGroup( (channel->isBroadcast() ? channel->inputChannel : input), (channel->isBroadcast() ? input : channel->inputChannel) - )).done([=](const MTPBool &result) { + )).done([=] { channel->setLinkedChat(*_savingData.linkedChat); continueSave(); }).fail([=] { @@ -1425,7 +1425,7 @@ void Controller::saveDescription() { _api.request(MTPmessages_EditChatAbout( _peer->input, MTP_string(*_savingData.description) - )).done([=](const MTPBool &result) { + )).done([=] { successCallback(); }).fail([=](const MTP::Error &error) { const auto &type = error.type(); diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index a592d2e646..fde79072e3 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -286,7 +286,7 @@ void Call::startIncoming() { _api.request(MTPphone_ReceivedCall( MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)) - )).done([=](const MTPBool &result) { + )).done([=] { if (_state.current() == State::Starting) { setState(State::WaitingIncoming); } diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp index cafcd577a5..b6c1f2a26c 100644 --- a/Telegram/SourceFiles/data/data_histories.cpp +++ b/Telegram/SourceFiles/data/data_histories.cpp @@ -553,11 +553,7 @@ void Histories::sendReadRequest(not_null history, State &state) { return session().api().request(MTPchannels_ReadHistory( channel->inputChannel, MTP_int(tillId) - )).done([=](const MTPBool &result) { - finished(); - }).fail([=] { - finished(); - }).send(); + )).done(finished).fail(finished).send(); } else { return session().api().request(MTPmessages_ReadHistory( history->peer->input, @@ -648,15 +644,11 @@ void Histories::deleteAllMessages( return session().api().request(MTPchannels_DeleteHistory( channel->inputChannel, MTP_int(deleteTillId) - )).done([=](const MTPBool &result) { - finish(); - }).fail(finish).send(); + )).done(finish).fail(finish).send(); } else if (revoke && chat && chat->amCreator()) { return session().api().request(MTPmessages_DeleteChat( chat->inputChat - )).done([=](const MTPBool &result) { - finish(); - }).fail([=](const MTP::Error &error) { + )).done(finish).fail([=](const MTP::Error &error) { if (error.type() == "PEER_ID_INVALID") { // Try to join and delete, // while delete fails for non-joined. diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index cb918c0eec..94656658dc 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -1122,7 +1122,7 @@ void SendReport( peer->input, apiReason, MTP_string(comment) - )).done([=](const MTPBool &result) { + )).done([=] { Ui::Toast::Show(tr::lng_report_thanks(tr::now)); }).send(); } else { @@ -1136,7 +1136,7 @@ void SendReport( MTP_vector(apiIds), apiReason, MTP_string(comment) - )).done([=](const MTPBool &result) { + )).done([=] { Ui::Toast::Show(tr::lng_report_thanks(tr::now)); }).send(); } diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp index bee37c0e4f..454403c41d 100644 --- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp +++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp @@ -353,7 +353,7 @@ void RepliesWidget::sendReadTillRequest() { _root->history()->peer->input, MTP_int(_root->id), MTP_int(_root->computeRepliesInboxReadTillFull()) - )).done(crl::guard(this, [=](const MTPBool &) { + )).done(crl::guard(this, [=] { _readRequestId = 0; reloadUnreadCountIfNeeded(); })).send(); diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp index aa3ad25a96..82d33af463 100644 --- a/Telegram/SourceFiles/intro/intro_widget.cpp +++ b/Telegram/SourceFiles/intro/intro_widget.cpp @@ -493,7 +493,7 @@ void Widget::resetAccount() { } _resetRequest = _api->request(MTPaccount_DeleteAccount( MTP_string("Forgot password") - )).done([=](const MTPBool &result) { + )).done([=] { _resetRequest = 0; Ui::hideLayer(); diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp index 887927553c..9df983fa9c 100644 --- a/Telegram/SourceFiles/passport/passport_form_controller.cpp +++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp @@ -747,7 +747,7 @@ std::vector> FormController::submitGetErrors() { MTP_bytes(credentialsEncryptedData.bytes), MTP_bytes(credentialsEncryptedData.hash), MTP_bytes(credentialsEncryptedSecret)) - )).done([=](const MTPBool &result) { + )).done([=] { _submitRequestId = 0; _submitSuccess = true; @@ -1035,7 +1035,7 @@ void FormController::cancelPassword() { return; } _passwordRequestId = _api.request(MTPaccount_CancelPasswordEmail( - )).done([=](const MTPBool &result) { + )).done([=] { _passwordRequestId = 0; reloadPassword(); }).fail([=] { @@ -1115,7 +1115,7 @@ void FormController::resetSecret( MTP_securePasswordKdfAlgoUnknown(), // secure_algo MTP_bytes(), // secure_secret MTP_long(0))) // secure_secret_id - )).done([=](const MTPBool &result) { + )).done([=] { _saveSecretRequestId = 0; generateSecret(password); }).fail([=](const MTP::Error &error) { @@ -1941,7 +1941,7 @@ void FormController::deleteValueEdit(not_null value) { const auto nonconst = findValue(value); nonconst->saveRequestId = _api.request(MTPaccount_DeleteSecureValue( MTP_vector(1, ConvertType(nonconst->type)) - )).done([=](const MTPBool &result) { + )).done([=] { resetValue(*nonconst); _valueSaveFinished.fire_copy(value); }).fail([=](const MTP::Error &error) { @@ -2297,7 +2297,7 @@ void FormController::saveSecret( Core::PrepareSecureSecretAlgo(_password.newSecureAlgo), MTP_bytes(encryptedSecret), MTP_long(saved.secretId))) - )).done([=](const MTPBool &result) { + )).done([=] { session().data().rememberPassportCredentials( std::move(saved), kRememberCredentialsDelay); diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index b329eab3c7..13fa456862 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -215,7 +215,7 @@ void TogglePinnedDialog( history->session().api().request(MTPmessages_ToggleDialogPin( MTP_flags(flags), MTP_inputDialogPeer(key.history()->peer->input) - )).done([=](const MTPBool &result) { + )).done([=] { owner->notifyPinnedDialogsOrderUpdated(); }).send(); } else if (const auto folder = key.folder()) {