diff --git a/.gitmodules b/.gitmodules index 76a2a7f44..d75517c26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,12 @@ [submodule "cmake"] path = cmake url = https://github.com/desktop-app/cmake_helpers.git +[submodule "Telegram/ThirdParty/expected"] + path = Telegram/ThirdParty/expected + url = https://github.com/TartanLlama/expected +[submodule "Telegram/ThirdParty/QR"] + path = Telegram/ThirdParty/QR + url = https://github.com/nayuki/QR-Code-generator +[submodule "Telegram/lib_qr"] + path = Telegram/lib_qr + url = https://github.com/desktop-app/lib_qr.git diff --git a/.travis.yml b/.travis.yml index 983351096..46708f159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ addons: - libvdpau-dev - libxcb-xkb-dev - libxkbcommon-dev + - libatspi2.0-dev - lintian - quilt - valac diff --git a/.travis/build.sh b/.travis/build.sh index 91d9e06b1..6033b51d3 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -17,7 +17,7 @@ XKB_PATH="$BUILD/libxkbcommon" XKB_CACHE_VERSION="3" QT_PATH="$BUILD/qt" -QT_CACHE_VERSION="4" +QT_CACHE_VERSION="5" QT_PATCH="$EXTERNAL/patches/qtbase_${QT_VERSION//\./_}.diff" BREAKPAD_PATH="$BUILD/breakpad" @@ -694,7 +694,6 @@ buildTelegram() { -Dlinux_path_qt=$QT_PATH \ -Dlinux_path_breakpad=$BREAKPAD_PATH \ -Dlinux_path_libexif_lib=/usr/local/lib \ - -Dlinux_path_opus_include=/usr/include/opus \ -Dlinux_lib_ssl=-lssl \ -Dlinux_lib_crypto=-lcrypto \ -Dlinux_lib_icu=-licuuc\ -licutu\ -licui18n \ diff --git a/Telegram/Resources/icons/intro_qr_plane.png b/Telegram/Resources/icons/intro_qr_plane.png new file mode 100644 index 000000000..cdc309f9d Binary files /dev/null and b/Telegram/Resources/icons/intro_qr_plane.png differ diff --git a/Telegram/Resources/icons/intro_qr_plane@2x.png b/Telegram/Resources/icons/intro_qr_plane@2x.png new file mode 100644 index 000000000..3d0c2e9af Binary files /dev/null and b/Telegram/Resources/icons/intro_qr_plane@2x.png differ diff --git a/Telegram/Resources/icons/intro_qr_plane@3x.png b/Telegram/Resources/icons/intro_qr_plane@3x.png new file mode 100644 index 000000000..ae5c5442e Binary files /dev/null and b/Telegram/Resources/icons/intro_qr_plane@3x.png differ diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index f72fad17b..6adb39522 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -178,8 +178,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_photo_caption" = "Caption"; "lng_photos_comment" = "Comment"; +"lng_intro_qr_title" = "Scan From Mobile Telegram"; +"lng_intro_qr_step1" = "**1.** Open Telegram on your phone"; +"lng_intro_qr_step2" = "**2.** Go to Settings > Devices > Scan QR Code"; +"lng_intro_qr_step3" = "**3.** Scan this image to Log In"; +"lng_intro_qr_skip" = "Or log in using your phone number"; + "lng_phone_title" = "Your Phone Number"; "lng_phone_desc" = "Please confirm your country code and\nenter your mobile phone number."; +"lng_phone_to_qr" = "Quick log in using QR code"; "lng_country_code" = "Country Code"; "lng_bad_country_code" = "Invalid Country Code"; "lng_country_ph" = "Search"; @@ -2231,6 +2238,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_mac_menu_new_group" = "New Group"; "lng_mac_menu_new_channel" = "New Channel"; "lng_mac_menu_show" = "Show Telegram"; +"lng_mac_menu_emoji_and_symbols" = "Emoji & Symbols"; "lng_mac_touchbar_favorite_stickers" = "Favorite stickers"; diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl index 5baf29966..823e996c2 100644 --- a/Telegram/Resources/tl/api.tl +++ b/Telegram/Resources/tl/api.tl @@ -89,6 +89,7 @@ inputDocumentFileLocation#bad07584 id:long access_hash:long file_reference:bytes inputSecureFileLocation#cbc7ee28 id:long access_hash:long = InputFileLocation; inputTakeoutFileLocation#29be5899 = InputFileLocation; inputPhotoFileLocation#40181ffe id:long access_hash:long file_reference:bytes thumb_size:string = InputFileLocation; +inputPhotoLegacyFileLocation#d83466f3 id:long access_hash:long file_reference:bytes volume_id:long local_id:int secret:long = InputFileLocation; inputPeerPhotoFileLocation#27d69997 flags:# big:flags.0?true peer:InputPeer volume_id:long local_id:int = InputFileLocation; inputStickerSetThumb#dbaeae9 stickerset:InputStickerSet volume_id:long local_id:int = InputFileLocation; @@ -347,6 +348,8 @@ updatePeerLocated#b4afcfb0 peers:Vector = Update; updateNewScheduledMessage#39a51dfb message:Message = Update; updateDeleteScheduledMessages#90866cee peer:Peer messages:Vector = Update; updateTheme#8216fba3 theme:Theme = Update; +updateGeoLiveViewed#871fb939 peer:Peer msg_id:int = Update; +updateLoginToken#564fe691 = Update; updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State; @@ -1082,6 +1085,12 @@ wallet.liteResponse#764386d7 response:bytes = wallet.LiteResponse; wallet.secretSalt#dd484d64 salt:bytes = wallet.KeySecretSalt; +auth.loginToken#629f1980 expires:int token:bytes = auth.LoginToken; +auth.loginTokenMigrateTo#68e9916 dc_id:int token:bytes = auth.LoginToken; +auth.loginTokenSuccess#390d5c5e authorization:auth.Authorization = auth.LoginToken; + +auth.loginTokenInfo#5203303a dc_id:int auth_key_id:long device_model:string platform:string system_version:string api_id:int app_name:string app_version:string ip:string region:string = auth.LoginTokenInfo; + ---functions--- invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X; @@ -1107,6 +1116,10 @@ auth.recoverPassword#4ea56e92 code:string = auth.Authorization; auth.resendCode#3ef1a9bf phone_number:string phone_code_hash:string = auth.SentCode; auth.cancelCode#1f040578 phone_number:string phone_code_hash:string = Bool; auth.dropTempAuthKeys#8e48a188 except_auth_keys:Vector = Bool; +auth.exportLoginToken#b1b41517 api_id:int api_hash:string except_ids:Vector = auth.LoginToken; +auth.importLoginToken#95ac5ce4 token:bytes = auth.LoginToken; +auth.acceptLoginToken#42e731b9 token:bytes = Updates; +auth.checkLoginToken#7d4fd4b0 token:bytes = auth.LoginTokenInfo; account.registerDevice#68976c6f flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector = Bool; account.unregisterDevice#3076c4bf token_type:int token:string other_uids:Vector = Bool; @@ -1422,4 +1435,4 @@ folders.deleteFolder#1c295881 folder_id:int = Updates; wallet.sendLiteRequest#e2c9d33e body:bytes = wallet.LiteResponse; wallet.getKeySecretSalt#b57f346 revoke:Bool = wallet.KeySecretSalt; -// LAYER 106 +// LAYER 107 diff --git a/Telegram/Resources/tl/mtproto.tl b/Telegram/Resources/tl/mtproto.tl index 83a770292..4b92c3e6e 100644 --- a/Telegram/Resources/tl/mtproto.tl +++ b/Telegram/Resources/tl/mtproto.tl @@ -21,6 +21,8 @@ p_q_inner_data_dc#a9f55f95 pq:string p:string q:string nonce:int128 server_nonce p_q_inner_data_temp#3c6a84d4 pq:string p:string q:string nonce:int128 server_nonce:int128 new_nonce:int256 expires_in:int = P_Q_inner_data; p_q_inner_data_temp_dc#56fddf88 pq:string p:string q:string nonce:int128 server_nonce:int128 new_nonce:int256 dc:int expires_in:int = P_Q_inner_data; +bind_auth_key_inner#75a3f765 nonce:long temp_auth_key_id:long perm_auth_key_id:long temp_session_id:long expires_at:int = BindAuthKeyInner; + server_DH_params_fail#79cb045d nonce:int128 server_nonce:int128 new_nonce_hash:int128 = Server_DH_Params; server_DH_params_ok#d0e8075c nonce:int128 server_nonce:int128 encrypted_answer:string = Server_DH_Params; diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 91eed0956..a1902727c 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.9.1.7" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 4ace1984c..e1f30a98f 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,1,0 - PRODUCTVERSION 1,9,1,0 + FILEVERSION 1,9,1,7 + PRODUCTVERSION 1,9,1,7 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.9.1.0" + VALUE "FileVersion", "1.9.1.7" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.1.0" + VALUE "ProductVersion", "1.9.1.7" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 29dcc0b7b..0c3c252af 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,1,0 - PRODUCTVERSION 1,9,1,0 + FILEVERSION 1,9,1,7 + PRODUCTVERSION 1,9,1,7 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.9.1.0" + VALUE "FileVersion", "1.9.1.7" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.1.0" + VALUE "ProductVersion", "1.9.1.7" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index b33afa76a..ee33614e2 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL //#include "history/feed/history_feed_section.h" // #feed #include "storage/localstorage.h" #include "main/main_session.h" +#include "main/main_account.h" #include "boxes/confirm_box.h" #include "boxes/stickers_box.h" #include "boxes/sticker_set_box.h" @@ -54,7 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/emoji_config.h" #include "support/support_helper.h" #include "storage/localimageloader.h" -#include "storage/file_download.h" +#include "storage/download_manager_mtproto.h" #include "storage/file_upload.h" #include "storage/storage_facade.h" #include "storage/storage_shared_media.h" @@ -222,7 +223,8 @@ bool ApiWrap::BlockedUsersSlice::operator!=(const BlockedUsersSlice &other) cons } ApiWrap::ApiWrap(not_null session) -: _session(session) +: MTP::Sender(session->account().mtp()) +, _session(session) , _messageDataResolveDelayed([=] { resolveMessageDatas(); }) , _webPagesTimer([=] { resolveWebPages(); }) , _draftsSaveTimer([=] { saveDraftsToCloud(); }) @@ -280,11 +282,11 @@ void ApiWrap::refreshProxyPromotion() { return; } const auto key = [&]() -> std::pair { - if (Global::ProxySettings() != ProxyData::Settings::Enabled) { + if (Global::ProxySettings() != MTP::ProxyData::Settings::Enabled) { return {}; } const auto &proxy = Global::SelectedProxy(); - if (proxy.type != ProxyData::Type::Mtproto) { + if (proxy.type != MTP::ProxyData::Type::Mtproto) { return {}; } return { proxy.host, proxy.port }; @@ -2971,12 +2973,12 @@ void ApiWrap::requestFileReference( void ApiWrap::refreshFileReference( Data::FileOrigin origin, - not_null loader, + not_null task, int requestId, const QByteArray ¤t) { - return refreshFileReference(origin, crl::guard(loader, [=]( + return refreshFileReference(origin, crl::guard(task, [=]( const UpdatedFileReferences &data) { - loader->refreshFileReferenceFrom(data, requestId, current); + task->refreshFileReferenceFrom(data, requestId, current); })); } diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 0656d974b..7ac173793 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -20,7 +20,6 @@ struct MessageGroupId; struct SendingAlbum; enum class SendMediaType; struct FileLoadTo; -class mtpFileLoader; namespace Main { class Session; @@ -38,6 +37,7 @@ class Result; namespace Storage { enum class SharedMediaType : signed char; struct PreparedList; +class DownloadMtprotoTask; } // namespace Storage namespace Dialogs { @@ -201,7 +201,7 @@ public: FileReferencesHandler &&handler); void refreshFileReference( Data::FileOrigin origin, - not_null loader, + not_null task, int requestId, const QByteArray ¤t); diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index ed831de5f..06e10fc37 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -203,7 +203,7 @@ void ShowAddParticipantsError( Ui::show(Box(text), Ui::LayerOption::KeepOther); } -class RevokePublicLinkBox::Inner : public TWidget, private MTP::Sender { +class RevokePublicLinkBox::Inner : public TWidget { public: Inner( QWidget *parent, @@ -228,6 +228,7 @@ private: void updateSelected(); const not_null _session; + MTP::Sender _api; PeerData *_selected = nullptr; PeerData *_pressed = nullptr; @@ -450,6 +451,7 @@ GroupInfoBox::GroupInfoBox( const QString &title, Fn)> channelDone) : _navigation(navigation) +, _api(_navigation->session().api().instance()) , _type(type) , _initialTitle(title) , _channelDone(std::move(channelDone)) { @@ -569,7 +571,7 @@ void GroupInfoBox::createGroup( if (inputs.empty()) { return; } - _creationRequestId = request(MTPmessages_CreateChat( + _creationRequestId = _api.request(MTPmessages_CreateChat( MTP_vector(inputs), MTP_string(title) )).done([=](const MTPUpdates &result) { @@ -645,7 +647,7 @@ void GroupInfoBox::createChannel(const QString &title, const QString &descriptio const auto flags = (_type == Type::Megagroup) ? MTPchannels_CreateChannel::Flag::f_megagroup : MTPchannels_CreateChannel::Flag::f_broadcast; - _creationRequestId = request(MTPchannels_CreateChannel( + _creationRequestId = _api.request(MTPchannels_CreateChannel( MTP_flags(flags), MTP_string(title), MTP_string(description), @@ -682,7 +684,7 @@ void GroupInfoBox::createChannel(const QString &title, const QString &descriptio std::move(image)); } _createdChannel = channel; - _creationRequestId = request(MTPmessages_ExportChatInvite( + _creationRequestId = _api.request(MTPmessages_ExportChatInvite( _createdChannel->input )).done([=](const MTPExportedChatInvite &result) { _creationRequestId = 0; @@ -1287,6 +1289,7 @@ RevokePublicLinkBox::Inner::Inner( Fn revokeCallback) : TWidget(parent) , _session(session) +, _api(_session->api().instance()) , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) , _revokeWidth(st::normalFont->width(tr::lng_channels_too_much_public_revoke(tr::now))) , _revokeCallback(std::move(revokeCallback)) { @@ -1294,7 +1297,7 @@ RevokePublicLinkBox::Inner::Inner( resize(width(), 5 * _rowHeight); - request(MTPchannels_GetAdminedPublicChannels( + _api.request(MTPchannels_GetAdminedPublicChannels( MTP_flags(0) )).done([=](const MTPmessages_Chats &result) { const auto &chats = result.match([](const auto &data) { @@ -1401,7 +1404,7 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) { auto confirmText = tr::lng_channels_too_much_public_revoke(tr::now); _weakRevokeConfirmBox = Ui::show(Box(text, confirmText, crl::guard(this, [this, pressed]() { if (_revokeRequestId) return; - _revokeRequestId = request(MTPchannels_UpdateUsername( + _revokeRequestId = _api.request(MTPchannels_UpdateUsername( pressed->asChannel()->inputChannel, MTP_string() )).done([=](const MTPBool &result) { diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h index e97eff55e..488893da8 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.h +++ b/Telegram/SourceFiles/boxes/add_contact_box.h @@ -94,7 +94,7 @@ private: }; -class GroupInfoBox : public Ui::BoxContent, private MTP::Sender { +class GroupInfoBox : public Ui::BoxContent { public: enum class Type { Group, @@ -124,6 +124,7 @@ private: void updateMaxHeight(); const not_null _navigation; + MTP::Sender _api; Type _type = Type::Group; QString _initialTitle; diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp index 9d91c177a..f69aac5db 100644 --- a/Telegram/SourceFiles/boxes/background_box.cpp +++ b/Telegram/SourceFiles/boxes/background_box.cpp @@ -53,10 +53,7 @@ QImage TakeMiddleSample(QImage original, QSize size) { } // namespace -class BackgroundBox::Inner - : public Ui::RpWidget - , private MTP::Sender - , private base::Subscriber { +class BackgroundBox::Inner : public Ui::RpWidget, private base::Subscriber { public: Inner( QWidget *parent, @@ -114,6 +111,7 @@ private: void validatePaperThumbnail(const Paper &paper) const; const not_null _session; + MTP::Sender _api; std::vector _papers; @@ -185,6 +183,7 @@ BackgroundBox::Inner::Inner( not_null session) : RpWidget(parent) , _session(session) +, _api(_session->api().instance()) , _check(std::make_unique(st::overviewCheck, [=] { update(); })) { _check->setChecked(true, Ui::RoundCheckbox::SetStyle::Fast); if (_session->data().wallpapers().empty()) { @@ -209,7 +208,7 @@ BackgroundBox::Inner::Inner( } void BackgroundBox::Inner::requestPapers() { - request(MTPaccount_GetWallPapers( + _api.request(MTPaccount_GetWallPapers( MTP_int(_session->data().wallpapersHash()) )).done([=](const MTPaccount_WallPapers &result) { if (_session->data().updateWallpapers(result)) { diff --git a/Telegram/SourceFiles/boxes/calendar_box.cpp b/Telegram/SourceFiles/boxes/calendar_box.cpp index 25bbbfe79..48cfdd794 100644 --- a/Telegram/SourceFiles/boxes/calendar_box.cpp +++ b/Telegram/SourceFiles/boxes/calendar_box.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "boxes/calendar_box.h" +#include "mtproto/mtproto_rpc_sender.h" #include "ui/widgets/buttons.h" #include "lang/lang_keys.h" #include "ui/effects/ripple_animation.h" diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index 402facdc0..c8b6efcd2 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_channel.h" #include "data/data_chat.h" #include "data/data_user.h" +#include "data/data_file_origin.h" #include "base/unixtime.h" #include "main/main_session.h" #include "observer_peer.h" diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h index 07c4971c0..d3c53edda 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.h +++ b/Telegram/SourceFiles/boxes/confirm_box.h @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "boxes/abstract_box.h" +#include "mtproto/mtproto_rpc_sender.h" namespace Main { class Session; diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp index 8e4b8bf48..6cd1a62e2 100644 --- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp @@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "numbers.h" #include "app.h" #include "lang/lang_keys.h" +#include "mtproto/facade.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.h b/Telegram/SourceFiles/boxes/confirm_phone_box.h index d2963f960..398b8062f 100644 --- a/Telegram/SourceFiles/boxes/confirm_phone_box.h +++ b/Telegram/SourceFiles/boxes/confirm_phone_box.h @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/abstract_box.h" #include "base/timer.h" #include "ui/widgets/input_fields.h" +#include "mtproto/mtproto_rpc_sender.h" namespace Ui { class InputField; diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index a4873f019..b0912fd9b 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/Telegram/SourceFiles/boxes/connection_box.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/call_delayed.h" #include "core/application.h" #include "main/main_account.h" +#include "mtproto/facade.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" @@ -38,6 +39,8 @@ namespace { constexpr auto kSaveSettingsDelayedTimeout = crl::time(1000); +using ProxyData = MTP::ProxyData; + class Base64UrlInput : public Ui::MaskedInputField { public: Base64UrlInput( @@ -1057,7 +1060,7 @@ void ProxiesBoxController::refreshChecker(Item &item) { item.state = ItemState::Checking; const auto setup = [&](Checker &checker, const bytes::vector &secret) { - checker = MTP::internal::AbstractConnection::Create( + checker = MTP::details::AbstractConnection::Create( mtproto, type, QThread::currentThread(), @@ -1105,7 +1108,7 @@ void ProxiesBoxController::refreshChecker(Item &item) { } void ProxiesBoxController::setupChecker(int id, const Checker &checker) { - using Connection = MTP::internal::AbstractConnection; + using Connection = MTP::details::AbstractConnection; const auto pointer = checker.get(); pointer->connect(pointer, &Connection::connected, [=] { const auto item = findById(id); @@ -1148,7 +1151,7 @@ object_ptr ProxiesBoxController::create() { for (const auto &item : _list) { updateView(item); } - return std::move(result); + return result; } auto ProxiesBoxController::findById(int id) -> std::vector::iterator { diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h index 37e7040f2..fbefdacb5 100644 --- a/Telegram/SourceFiles/boxes/connection_box.h +++ b/Telegram/SourceFiles/boxes/connection_box.h @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "base/object_ptr.h" #include "mtproto/connection_abstract.h" +#include "mtproto/mtproto_proxy_data.h" namespace Ui { class BoxContent; @@ -25,6 +26,7 @@ class Radioenum; class ProxiesBoxController : public base::Subscriber { public: + using ProxyData = MTP::ProxyData; using Type = ProxyData::Type; ProxiesBoxController(); @@ -73,7 +75,7 @@ public: ~ProxiesBoxController(); private: - using Checker = MTP::internal::ConnectionPointer; + using Checker = MTP::details::ConnectionPointer; struct Item { int id = 0; ProxyData data; diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp index ad9a1db47..11d44d311 100644 --- a/Telegram/SourceFiles/boxes/create_poll_box.cpp +++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp @@ -768,7 +768,7 @@ object_ptr CreatePollBox::setupContent() { FocusAtEnd(question); }, lifetime()); - return std::move(result); + return result; } void CreatePollBox::prepare() { diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h index 14e7cd5c3..d5136afb4 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.h +++ b/Telegram/SourceFiles/boxes/edit_caption_box.h @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/storage_media_prepare.h" #include "ui/wrap/slide_wrap.h" #include "media/clip/media_clip_reader.h" +#include "mtproto/mtproto_rpc_sender.h" namespace ChatHelpers { class TabbedPanel; diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h index 1060157fd..4310d1b51 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.h +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h @@ -100,7 +100,7 @@ private: }; -class EditPrivacyBox : public Ui::BoxContent, private MTP::Sender { +class EditPrivacyBox : public Ui::BoxContent { public: using Value = ApiWrap::Privacy; using Option = Value::Option; diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index 26a073c50..96ce5c731 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/confirm_box.h" #include "boxes/confirm_phone_box.h" #include "mainwindow.h" +#include "apiwrap.h" #include "main/main_session.h" #include "storage/localstorage.h" #include "ui/widgets/buttons.h" @@ -47,6 +48,7 @@ PasscodeBox::PasscodeBox( not_null session, bool turningOff) : _session(session) +, _api(_session->api().instance()) , _turningOff(turningOff) , _about(st::boxWidth - st::boxPadding.left() * 1.5) , _oldPasscode(this, st::defaultInputField, tr::lng_passcode_enter_old()) @@ -62,6 +64,7 @@ PasscodeBox::PasscodeBox( not_null session, const CloudFields &fields) : _session(session) +, _api(_session->api().instance()) , _turningOff(fields.turningOff) , _cloudPwd(true) , _cloudFields(fields) @@ -357,7 +360,7 @@ void PasscodeBox::validateEmail( if (_setRequest) { return; } - _setRequest = request(MTPaccount_ConfirmPasswordEmail( + _setRequest = _api.request(MTPaccount_ConfirmPasswordEmail( MTP_string(code) )).done([=](const MTPBool &result) { *set = true; @@ -387,7 +390,7 @@ void PasscodeBox::validateEmail( if (_setRequest) { return; } - _setRequest = request(MTPaccount_ResendPasswordEmail( + _setRequest = _api.request(MTPaccount_ResendPasswordEmail( )).done([=](const MTPBool &result) { _setRequest = 0; resent->fire(tr::lng_cloud_password_resent(tr::now)); @@ -597,8 +600,8 @@ void PasscodeBox::requestPasswordData() { return serverError(); } - request(base::take(_setRequest)).cancel(); - _setRequest = request( + _api.request(base::take(_setRequest)).cancel(); + _setRequest = _api.request( MTPaccount_GetPassword() ).done([=](const MTPaccount_Password &result) { _setRequest = 0; @@ -636,7 +639,7 @@ void PasscodeBox::sendClearCloudPassword( | MTPDaccount_passwordInputSettings::Flag::f_new_password_hash | MTPDaccount_passwordInputSettings::Flag::f_hint | MTPDaccount_passwordInputSettings::Flag::f_email; - _setRequest = request(MTPaccount_UpdatePasswordSettings( + _setRequest = _api.request(MTPaccount_UpdatePasswordSettings( check.result, MTP_account_passwordInputSettings( MTP_flags(flags), @@ -667,7 +670,7 @@ void PasscodeBox::setNewCloudPassword(const QString &newPassword) { | MTPDaccount_passwordInputSettings::Flag::f_hint | MTPDaccount_passwordInputSettings::Flag::f_email; _checkPasswordCallback = nullptr; - _setRequest = request(MTPaccount_UpdatePasswordSettings( + _setRequest = _api.request(MTPaccount_UpdatePasswordSettings( MTP_inputCheckPasswordEmpty(), MTP_account_passwordInputSettings( MTP_flags(flags), @@ -695,7 +698,7 @@ void PasscodeBox::changeCloudPassword( const QString &oldPassword, const Core::CloudPasswordResult &check, const QString &newPassword) { - _setRequest = request(MTPaccount_GetPasswordSettings( + _setRequest = _api.request(MTPaccount_GetPasswordSettings( check.result )).done([=](const MTPaccount_PasswordSettings &result) { _setRequest = 0; @@ -760,7 +763,7 @@ void PasscodeBox::resetSecret( const QString &newPassword, Fn callback) { using Flag = MTPDaccount_passwordInputSettings::Flag; - _setRequest = request(MTPaccount_UpdatePasswordSettings( + _setRequest = _api.request(MTPaccount_UpdatePasswordSettings( check.result, MTP_account_passwordInputSettings( MTP_flags(Flag::f_new_secure_settings), @@ -814,7 +817,7 @@ void PasscodeBox::sendChangeCloudPassword( _cloudFields.newSecureSecretAlgo, bytes::make_span(newPasswordBytes))); } - _setRequest = request(MTPaccount_UpdatePasswordSettings( + _setRequest = _api.request(MTPaccount_UpdatePasswordSettings( check.result, MTP_account_passwordInputSettings( MTP_flags(flags), @@ -873,7 +876,7 @@ void PasscodeBox::emailChanged() { void PasscodeBox::recoverByEmail() { if (_pattern.isEmpty()) { _pattern = "-"; - request(MTPauth_RequestPasswordRecovery( + _api.request(MTPauth_RequestPasswordRecovery( )).done([=](const MTPauth_PasswordRecovery &result) { recoverStarted(result); }).fail([=](const RPCError &error) { diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h index a8ad5ea8c..03ab68f87 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.h +++ b/Telegram/SourceFiles/boxes/passcode_box.h @@ -25,7 +25,7 @@ namespace Core { struct CloudPasswordState; } // namespace Core -class PasscodeBox : public Ui::BoxContent, private MTP::Sender { +class PasscodeBox : public Ui::BoxContent { public: PasscodeBox(QWidget*, not_null session, bool turningOff); @@ -130,6 +130,7 @@ private: void serverError(); const not_null _session; + MTP::Sender _api; QString _pattern; diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index 3259bc737..821c7641f 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -1287,7 +1287,6 @@ void PeerListContent::loadProfilePhotos() { auto yFrom = _visibleTop; auto yTo = _visibleBottom + (_visibleBottom - _visibleTop) * PreloadHeightsCount; - _controller->session().downloader().clearPriorities(); if (yTo < 0) return; if (yFrom < 0) yFrom = 0; diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp index 190c2f372..606ecc4f4 100644 --- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp @@ -142,7 +142,8 @@ void PeerListRowWithLink::paintAction( PeerListGlobalSearchController::PeerListGlobalSearchController( not_null navigation) -: _navigation(navigation) { +: _navigation(navigation) +, _api(_navigation->session().api().instance()) { _timer.setCallback([this] { searchOnServer(); }); } @@ -169,7 +170,7 @@ bool PeerListGlobalSearchController::searchInCache() { } void PeerListGlobalSearchController::searchOnServer() { - _requestId = request(MTPcontacts_Search( + _requestId = _api.request(MTPcontacts_Search( MTP_string(_query), MTP_int(SearchPeopleLimit) )).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) { diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h index ddc4ba4f8..a1a52e701 100644 --- a/Telegram/SourceFiles/boxes/peer_list_controllers.h +++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h @@ -59,9 +59,7 @@ private: }; -class PeerListGlobalSearchController - : public PeerListSearchController - , private MTP::Sender { +class PeerListGlobalSearchController : public PeerListSearchController { public: PeerListGlobalSearchController( not_null navigation); @@ -78,6 +76,7 @@ private: void searchDone(const MTPcontacts_Found &result, mtpRequestId requestId); const not_null _navigation; + MTP::Sender _api; base::Timer _timer; QString _query; mtpRequestId _requestId = 0; diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp index 08c95bc72..ff7d2c3d1 100644 --- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp @@ -276,6 +276,7 @@ AddSpecialBoxController::AddSpecialBoxController( peer, &_additional)) , _peer(peer) +, _api(_peer->session().api().instance()) , _role(role) , _additional(peer, Role::Members) , _adminDoneCallback(std::move(adminDoneCallback)) @@ -408,7 +409,7 @@ void AddSpecialBoxController::loadMoreRows() { const auto participantsHash = 0; const auto channel = _peer->asChannel(); - _loadRequestId = request(MTPchannels_GetParticipants( + _loadRequestId = _api.request(MTPchannels_GetParticipants( channel->inputChannel, MTP_channelParticipantsRecent(), MTP_int(_offset), @@ -464,7 +465,7 @@ bool AddSpecialBoxController::checkInfoLoaded( // We don't know what this user status is in the group. const auto channel = _peer->asChannel(); - request(MTPchannels_GetParticipant( + _api.request(MTPchannels_GetParticipant( channel->inputChannel, user->inputUser )).done([=](const MTPchannels_ChannelParticipant &result) { @@ -829,6 +830,7 @@ AddSpecialBoxSearchController::AddSpecialBoxSearchController( not_null additional) : _peer(peer) , _additional(additional) +, _api(_peer->session().api().instance()) , _timer([=] { searchOnServer(); }) { subscribeToMigration(); } @@ -924,7 +926,7 @@ void AddSpecialBoxSearchController::requestParticipants() { const auto participantsHash = 0; const auto channel = _peer->asChannel(); - _requestId = request(MTPchannels_GetParticipants( + _requestId = _api.request(MTPchannels_GetParticipants( channel->inputChannel, MTP_channelParticipantsSearch(MTP_string(_query)), MTP_int(_offset), @@ -1012,7 +1014,7 @@ void AddSpecialBoxSearchController::requestGlobal() { } auto perPage = SearchPeopleLimit; - _requestId = request(MTPcontacts_Search( + _requestId = _api.request(MTPcontacts_Search( MTP_string(_query), MTP_int(perPage) )).done([=](const MTPcontacts_Found &result, mtpRequestId requestId) { diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h index d15f474e8..2761d172d 100644 --- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h +++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h @@ -69,7 +69,6 @@ private: class AddSpecialBoxController : public PeerListController , private base::Subscriber - , private MTP::Sender , public base::has_weak_ptr { public: using Role = ParticipantsBoxController::Role; @@ -87,12 +86,12 @@ public: AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback); - Main::Session &session() const override; + [[nodiscard]] Main::Session &session() const override; void prepare() override; void rowClicked(not_null row) override; void loadMoreRows() override; - std::unique_ptr createSearchRow( + [[nodiscard]] std::unique_ptr createSearchRow( not_null peer) override; private: @@ -120,6 +119,7 @@ private: void migrate(not_null channel); not_null _peer; + MTP::Sender _api; Role _role = Role::Admins; int _offset = 0; mtpRequestId _loadRequestId = 0; @@ -139,7 +139,6 @@ protected: // Finds chat/channel members, then contacts, then global search results. class AddSpecialBoxSearchController : public PeerListSearchController - , private MTP::Sender , private base::Subscriber { public: using Role = ParticipantsBoxController::Role; @@ -181,6 +180,7 @@ private: not_null _peer; not_null _additional; + MTP::Sender _api; base::Timer _timer; QString _query; diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp index d490a38f4..cc55265a8 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp @@ -223,7 +223,7 @@ object_ptr SetupAbout( tr::now, Ui::Text::WithEntities); }()); - return std::move(about); + return about; } object_ptr SetupFooter( diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h index 7ef9e877e..689b08a7b 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h @@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/abstract_box.h" #include "base/unique_qptr.h" +class RPCError; + namespace Ui { class FlatLabel; class LinkButton; diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp index 09a0960f6..f250ca81f 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp @@ -745,6 +745,7 @@ ParticipantsBoxController::ParticipantsBoxController( : PeerListController(CreateSearchController(peer, role, &_additional)) , _navigation(navigation) , _peer(peer) +, _api(_peer->session().api().instance()) , _role(role) , _additional(peer, _role) { subscribeToMigration(); @@ -1022,7 +1023,7 @@ void ParticipantsBoxController::restoreState( : nullptr; if (const auto my = dynamic_cast(typeErasedState)) { if (const auto requestId = base::take(_loadRequestId)) { - request(requestId).cancel(); + _api.request(requestId).cancel(); } _additional = std::move(my->additional); @@ -1251,7 +1252,7 @@ void ParticipantsBoxController::loadMoreRows() { : kParticipantsFirstPageCount; const auto participantsHash = 0; - _loadRequestId = request(MTPchannels_GetParticipants( + _loadRequestId = _api.request(MTPchannels_GetParticipants( channel->inputChannel, filter, MTP_int(_offset), @@ -1786,7 +1787,7 @@ std::unique_ptr ParticipantsBoxController::createRow( row->setActionLink(tr::lng_profile_kick(tr::now)); } } - return std::move(row); + return row; } auto ParticipantsBoxController::computeType( @@ -1906,7 +1907,8 @@ ParticipantsBoxSearchController::ParticipantsBoxSearchController( not_null additional) : _channel(channel) , _role(role) -, _additional(additional) { +, _additional(additional) +, _api(_channel->session().api().instance()) { _timer.setCallback([=] { searchOnServer(); }); } @@ -1931,14 +1933,14 @@ auto ParticipantsBoxSearchController::saveState() const result->offset = _offset; result->allLoaded = _allLoaded; result->wasLoading = (_requestId != 0); - return std::move(result); + return result; } void ParticipantsBoxSearchController::restoreState( std::unique_ptr state) { if (auto my = dynamic_cast(state.get())) { if (auto requestId = base::take(_requestId)) { - request(requestId).cancel(); + _api.request(requestId).cancel(); } _cache.clear(); _queries.clear(); @@ -2002,7 +2004,7 @@ bool ParticipantsBoxSearchController::loadMoreRows() { auto perPage = kParticipantsPerPage; auto participantsHash = 0; - _requestId = request(MTPchannels_GetParticipants( + _requestId = _api.request(MTPchannels_GetParticipants( _channel->inputChannel, filter, MTP_int(_offset), diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h index af0b8decc..fd36c97ce 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h @@ -134,7 +134,6 @@ private: class ParticipantsBoxController : public PeerListController , private base::Subscriber - , private MTP::Sender , public base::has_weak_ptr { public: using Role = ParticipantsRole; @@ -238,6 +237,7 @@ private: not_null _navigation; not_null _peer; + MTP::Sender _api; Role _role = Role::Admins; int _offset = 0; mtpRequestId _loadRequestId = 0; @@ -251,9 +251,7 @@ private: }; // Members, banned and restricted users server side search. -class ParticipantsBoxSearchController - : public PeerListSearchController - , private MTP::Sender { +class ParticipantsBoxSearchController : public PeerListSearchController { public: using Role = ParticipantsBoxController::Role; @@ -295,6 +293,7 @@ private: not_null _channel; Role _role = Role::Restricted; not_null _additional; + MTP::Sender _api; base::Timer _timer; QString _query; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 918901b88..7dd7e538f 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -240,9 +240,7 @@ namespace { constexpr auto kMaxGroupChannelTitle = 128; // See also add_contact_box. constexpr auto kMaxChannelDescription = 255; // See also add_contact_box. -class Controller - : public base::has_weak_ptr - , private MTP::Sender { +class Controller : public base::has_weak_ptr { public: Controller( not_null navigation, @@ -334,6 +332,7 @@ private: const not_null _navigation; const not_null _box; not_null _peer; + MTP::Sender _api; const bool _isGroup = false; base::unique_qptr _wrap; @@ -344,7 +343,6 @@ private: const rpl::event_stream _privacyTypeUpdates; const rpl::event_stream _linkedChatUpdates; - MTP::Sender _linkedChatsRequester; mtpRequestId _linkedChatsRequestId = 0; rpl::lifetime _lifetime; @@ -358,6 +356,7 @@ Controller::Controller( : _navigation(navigation) , _box(box) , _peer(peer) +, _api(_peer->session().api().instance()) , _isGroup(_peer->isChat() || _peer->isMegagroup()) { _box->setTitle(_isGroup ? tr::lng_edit_group() @@ -478,7 +477,7 @@ object_ptr Controller::createTitleEdit() { [=] { submitTitle(); }); _controls.title = result->entity(); - return std::move(result); + return result; } object_ptr Controller::createDescriptionEdit() { @@ -512,7 +511,7 @@ object_ptr Controller::createDescriptionEdit() { [=] { submitDescription(); }); _controls.description = result->entity(); - return std::move(result); + return result; } object_ptr Controller::createManageGroupButtons() { @@ -526,7 +525,7 @@ object_ptr Controller::createManageGroupButtons() { fillManageSection(); - return std::move(result); + return result; } object_ptr Controller::createStickersEdit() { @@ -564,7 +563,7 @@ object_ptr Controller::createStickersEdit() { Ui::show(Box(channel), Ui::LayerOption::KeepOther); }); - return std::move(result); + return result; } bool Controller::canEditInformation() const { @@ -644,7 +643,7 @@ void Controller::showEditLinkedChatBox() { callback(_linkedChatOriginalValue); return; } - _linkedChatsRequestId = _linkedChatsRequester.request( + _linkedChatsRequestId = _api.request( MTPchannels_GetGroupsForDiscussion() ).done([=](const MTPmessages_Chats &result) { _linkedChatsRequestId = 0; @@ -1187,7 +1186,7 @@ void Controller::saveUsername() { return; } - request(MTPchannels_UpdateUsername( + _api.request(MTPchannels_UpdateUsername( channel->inputChannel, MTP_string(*_savingData.username) )).done([=](const MTPBool &result) { @@ -1242,7 +1241,7 @@ void Controller::saveLinkedChat() { const auto input = *_savingData.linkedChat ? (*_savingData.linkedChat)->inputChannel : MTP_inputChannelEmpty(); - request(MTPchannels_SetDiscussionGroup( + _api.request(MTPchannels_SetDiscussionGroup( (channel->isBroadcast() ? channel->inputChannel : input), (channel->isBroadcast() ? input : channel->inputChannel) )).done([=](const MTPBool &result) { @@ -1283,14 +1282,14 @@ void Controller::saveTitle() { }; if (const auto channel = _peer->asChannel()) { - request(MTPchannels_EditTitle( + _api.request(MTPchannels_EditTitle( channel->inputChannel, MTP_string(*_savingData.title) )).done(std::move(onDone) ).fail(std::move(onFail) ).send(); } else if (const auto chat = _peer->asChat()) { - request(MTPmessages_EditChatTitle( + _api.request(MTPmessages_EditChatTitle( chat->inputChat, MTP_string(*_savingData.title) )).done(std::move(onDone) @@ -1311,7 +1310,7 @@ void Controller::saveDescription() { _peer->setAbout(*_savingData.description); continueSave(); }; - request(MTPmessages_EditChatAbout( + _api.request(MTPmessages_EditChatAbout( _peer->input, MTP_string(*_savingData.description) )).done([=](const MTPBool &result) { @@ -1368,7 +1367,7 @@ void Controller::togglePreHistoryHidden( done(); }; - request(MTPchannels_TogglePreHistoryHidden( + _api.request(MTPchannels_TogglePreHistoryHidden( channel->inputChannel, MTP_bool(hidden) )).done([=](const MTPUpdates &result) { @@ -1390,7 +1389,7 @@ void Controller::saveSignatures() { || *_savingData.signatures == channel->addsSignature()) { return continueSave(); } - request(MTPchannels_ToggleSignatures( + _api.request(MTPchannels_ToggleSignatures( channel->inputChannel, MTP_bool(*_savingData.signatures) )).done([=](const MTPUpdates &result) { diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index 7c67aba61..71ee082ca 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -51,9 +51,7 @@ namespace { constexpr auto kUsernameCheckTimeout = crl::time(200); constexpr auto kMinUsernameLength = 5; -class Controller - : public base::has_weak_ptr - , private MTP::Sender { +class Controller : public base::has_weak_ptr { public: Controller( not_null container, @@ -144,6 +142,7 @@ private: QString inviteLinkText(); not_null _peer; + MTP::Sender _api; std::optional _privacySavedValue; std::optional _usernameSavedValue; @@ -169,6 +168,7 @@ Controller::Controller( std::optional privacySavedValue, std::optional usernameSavedValue) : _peer(peer) +, _api(_peer->session().api().instance()) , _privacySavedValue(privacySavedValue) , _usernameSavedValue(usernameSavedValue) , _useLocationPhrases(useLocationPhrases) @@ -364,7 +364,7 @@ object_ptr Controller::createUsernameEdit() { const auto shown = (_controls.privacy->value() == Privacy::HasUsername); result->toggle(shown, anim::type::instant); - return std::move(result); + return result; } void Controller::privacyChanged(Privacy value) { @@ -401,7 +401,7 @@ void Controller::privacyChanged(Privacy value) { refreshVisibilities(); _controls.usernameInput->setDisplayFocused(true); } else { - request(base::take(_checkUsernameRequestId)).cancel(); + _api.request(base::take(_checkUsernameRequestId)).cancel(); _checkUsernameTimer.cancel(); refreshVisibilities(); } @@ -420,11 +420,11 @@ void Controller::checkUsernameAvailability() { return; } if (_checkUsernameRequestId) { - request(_checkUsernameRequestId).cancel(); + _api.request(_checkUsernameRequestId).cancel(); } const auto channel = _peer->migrateToOrMe()->asChannel(); const auto username = channel ? channel->username : QString(); - _checkUsernameRequestId = request(MTPchannels_CheckUsername( + _checkUsernameRequestId = _api.request(MTPchannels_CheckUsername( channel ? channel->inputChannel : MTP_inputChannelEmpty(), MTP_string(checking) )).done([=](const MTPBool &result) { @@ -630,7 +630,7 @@ object_ptr Controller::createInviteLinkEdit() { observeInviteLink(); - return std::move(result); + return result; } void Controller::refreshEditInviteLink() { @@ -692,7 +692,7 @@ object_ptr Controller::createInviteLinkCreate() { observeInviteLink(); - return std::move(result); + return result; } void Controller::refreshCreateInviteLink() { diff --git a/Telegram/SourceFiles/boxes/rate_call_box.cpp b/Telegram/SourceFiles/boxes/rate_call_box.cpp index be102184b..85294a3fe 100644 --- a/Telegram/SourceFiles/boxes/rate_call_box.cpp +++ b/Telegram/SourceFiles/boxes/rate_call_box.cpp @@ -31,6 +31,7 @@ RateCallBox::RateCallBox( uint64 callId, uint64 callAccessHash) : _session(session) +, _api(_session->api().instance()) , _callId(callId) , _callAccessHash(callAccessHash) { } @@ -120,7 +121,7 @@ void RateCallBox::send() { return; } auto comment = _comment ? _comment->getLastText().trimmed() : QString(); - _requestId = request(MTPphone_SetCallRating( + _requestId = _api.request(MTPphone_SetCallRating( MTP_flags(0), MTP_inputPhoneCall(MTP_long(_callId), MTP_long(_callAccessHash)), MTP_int(_rating), diff --git a/Telegram/SourceFiles/boxes/rate_call_box.h b/Telegram/SourceFiles/boxes/rate_call_box.h index 9efaa4d53..99ca677d8 100644 --- a/Telegram/SourceFiles/boxes/rate_call_box.h +++ b/Telegram/SourceFiles/boxes/rate_call_box.h @@ -20,7 +20,7 @@ namespace Main { class Session; } // namespace Main -class RateCallBox : public Ui::BoxContent, private MTP::Sender { +class RateCallBox : public Ui::BoxContent { public: RateCallBox( QWidget*, @@ -41,6 +41,7 @@ private: void commentResized(); const not_null _session; + MTP::Sender _api; uint64 _callId = 0; uint64 _callAccessHash = 0; diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp index 5ad271db2..28697df52 100644 --- a/Telegram/SourceFiles/boxes/report_box.cpp +++ b/Telegram/SourceFiles/boxes/report_box.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "ui/toast/toast.h" +#include "mtproto/facade.h" #include "mainwindow.h" #include "styles/style_layers.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/report_box.h b/Telegram/SourceFiles/boxes/report_box.h index d7afc3761..05782b8ce 100644 --- a/Telegram/SourceFiles/boxes/report_box.h +++ b/Telegram/SourceFiles/boxes/report_box.h @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "boxes/abstract_box.h" +#include "mtproto/mtproto_rpc_sender.h" namespace Ui { template diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.h b/Telegram/SourceFiles/boxes/self_destruction_box.h index 475f59749..95f7928c8 100644 --- a/Telegram/SourceFiles/boxes/self_destruction_box.h +++ b/Telegram/SourceFiles/boxes/self_destruction_box.h @@ -20,7 +20,7 @@ namespace Main { class Session; } // namespace Main -class SelfDestructionBox : public Ui::BoxContent, private MTP::Sender { +class SelfDestructionBox : public Ui::BoxContent { public: SelfDestructionBox( QWidget*, diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp index 91247790d..071058b17 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.cpp +++ b/Telegram/SourceFiles/boxes/sessions_box.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" +#include "apiwrap.h" #include "main/main_session.h" #include "data/data_session.h" #include "base/unixtime.h" @@ -77,6 +78,7 @@ private: SessionsBox::SessionsBox(QWidget*, not_null session) : _session(session) +, _api(_session->api().instance()) , _shortPollTimer([=] { shortPollSessions(); }) { } @@ -280,7 +282,7 @@ void SessionsBox::shortPollSessions() { if (_shortPollRequest) { return; } - _shortPollRequest = request(MTPaccount_GetAuthorizations( + _shortPollRequest = _api.request(MTPaccount_GetAuthorizations( )).done([=](const MTPaccount_Authorizations &result) { got(result); }).send(); @@ -294,7 +296,7 @@ void SessionsBox::terminateOne(uint64 hash) { _terminateBox->closeBox(); _terminateBox = nullptr; } - request(MTPaccount_ResetAuthorization( + _api.request(MTPaccount_ResetAuthorization( MTP_long(hash) )).done([=](const MTPBool &result) { _inner->terminatingOne(hash, false); @@ -330,12 +332,12 @@ void SessionsBox::terminateAll() { _terminateBox->closeBox(); _terminateBox = nullptr; } - request(MTPauth_ResetAuthorizations( + _api.request(MTPauth_ResetAuthorizations( )).done([=](const MTPBool &result) { - request(base::take(_shortPollRequest)).cancel(); + _api.request(base::take(_shortPollRequest)).cancel(); shortPollSessions(); }).fail([=](const RPCError &result) { - request(base::take(_shortPollRequest)).cancel(); + _api.request(base::take(_shortPollRequest)).cancel(); shortPollSessions(); }).send(); setLoading(true); diff --git a/Telegram/SourceFiles/boxes/sessions_box.h b/Telegram/SourceFiles/boxes/sessions_box.h index b27ec5dd4..b2c7953eb 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.h +++ b/Telegram/SourceFiles/boxes/sessions_box.h @@ -22,7 +22,7 @@ namespace Main { class Session; } // namespace Main -class SessionsBox : public Ui::BoxContent, private MTP::Sender { +class SessionsBox : public Ui::BoxContent { public: SessionsBox(QWidget*, not_null session); @@ -60,6 +60,7 @@ private: void terminateAll(); const not_null _session; + MTP::Sender _api; bool _loading = false; Full _data; diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 0f319b401..49c2b32ee 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -722,7 +722,6 @@ void ShareBox::Inner::loadProfilePhotos(int yFrom) { yFrom *= _columnCount; yTo *= _columnCount; - _navigation->session().downloader().clearPriorities(); if (_filter.isEmpty()) { if (!_chatsIndexed->empty()) { auto i = _chatsIndexed->cfind(yFrom, _rowHeight); diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h index 55d223c04..b5d3f5397 100644 --- a/Telegram/SourceFiles/boxes/share_box.h +++ b/Telegram/SourceFiles/boxes/share_box.h @@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "ui/effects/animations.h" #include "ui/effects/round_checkbox.h" +#include "mtproto/mtproto_rpc_sender.h" enum class SendMenuType; diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 597d71826..ca7130b2b 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_session.h" +#include "data/data_file_origin.h" #include "lang/lang_keys.h" #include "chat_helpers/stickers.h" #include "boxes/confirm_box.h" @@ -99,7 +100,7 @@ private: void showPreview(); not_null _controller; - MTP::Sender _mtp; + MTP::Sender _api; std::vector _elements; std::unique_ptr _lottiePlayer; Stickers::Pack _pack; @@ -220,6 +221,7 @@ StickerSetBox::Inner::Inner( const MTPInputStickerSet &set) : RpWidget(parent) , _controller(controller) +, _api(_controller->session().api().instance()) , _input(set) , _previewTimer([=] { showPreview(); }) { set.match([&](const MTPDinputStickerSetID &data) { @@ -231,7 +233,7 @@ StickerSetBox::Inner::Inner( }, [&](const MTPDinputStickerSetAnimatedEmoji &) { }); - _mtp.request(MTPmessages_GetStickerSet( + _api.request(MTPmessages_GetStickerSet( _input )).done([=](const MTPmessages_StickerSet &result) { gotSet(result); @@ -700,7 +702,7 @@ void StickerSetBox::Inner::install() { } else if (_installRequest) { return; } - _installRequest = _mtp.request(MTPmessages_InstallStickerSet( + _installRequest = _api.request(MTPmessages_InstallStickerSet( _input, MTP_bool(false) )).done([=](const MTPmessages_StickerSetInstallResult &result) { diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index c426a2316..3f819d294 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_session.h" #include "data/data_channel.h" +#include "data/data_file_origin.h" #include "core/application.h" #include "lang/lang_keys.h" #include "mainwidget.h" @@ -661,6 +662,7 @@ StickersBox::Inner::Inner( StickersBox::Section section) : RpWidget(parent) , _session(session) +, _api(_session->api().instance()) , _section(section) , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) , _shiftingAnimation([=](crl::time now) { @@ -677,6 +679,7 @@ StickersBox::Inner::Inner( StickersBox::Inner::Inner(QWidget *parent, not_null megagroup) : RpWidget(parent) , _session(&megagroup->session()) +, _api(_session->api().instance()) , _section(StickersBox::Section::Installed) , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) , _shiftingAnimation([=](crl::time now) { @@ -1469,11 +1472,13 @@ void StickersBox::Inner::handleMegagroupSetAddressChange() { } } } else if (!_megagroupSetRequestId) { - _megagroupSetRequestId = request(MTPmessages_GetStickerSet(MTP_inputStickerSetShortName(MTP_string(text)))).done([this](const MTPmessages_StickerSet &result) { + _megagroupSetRequestId = _api.request(MTPmessages_GetStickerSet( + MTP_inputStickerSetShortName(MTP_string(text)) + )).done([=](const MTPmessages_StickerSet &result) { _megagroupSetRequestId = 0; auto set = Stickers::FeedSetFull(result); setMegagroupSelectedSet(MTP_inputStickerSetID(MTP_long(set->id), MTP_long(set->access))); - }).fail([this](const RPCError &error) { + }).fail([=](const RPCError &error) { _megagroupSetRequestId = 0; setMegagroupSelectedSet(MTP_inputStickerSetEmpty()); }).send(); diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h index d5aba39ed..3cdd90a18 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.h +++ b/Telegram/SourceFiles/boxes/stickers_box.h @@ -153,8 +153,7 @@ private: // This class is hold in header because it requires Qt preprocessing. class StickersBox::Inner : public Ui::RpWidget - , private base::Subscriber - , private MTP::Sender { + , private base::Subscriber { Q_OBJECT public: @@ -320,6 +319,7 @@ private: int countMaxNameWidth() const; const not_null _session; + MTP::Sender _api; Section _section; diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h index 2cc31dd52..3a78c6596 100644 --- a/Telegram/SourceFiles/boxes/username_box.h +++ b/Telegram/SourceFiles/boxes/username_box.h @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "boxes/abstract_box.h" +#include "mtproto/mtproto_rpc_sender.h" namespace Ui { class UsernameInput; diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp index 937c34a74..7b2000892 100644 --- a/Telegram/SourceFiles/calls/calls_box_controller.cpp +++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp @@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_session.h" #include "data/data_media_types.h" #include "data/data_user.h" +#include "apiwrap.h" #include "facades.h" #include "app.h" @@ -216,7 +217,8 @@ void BoxController::Row::stopLastActionRipple() { } BoxController::BoxController(not_null window) -: _window(window) { +: _window(window) +, _api(_window->session().api().instance()) { } Main::Session &BoxController::session() const { @@ -256,7 +258,7 @@ void BoxController::loadMoreRows() { return; } - _loadRequestId = request(MTPmessages_Search( + _loadRequestId = _api.request(MTPmessages_Search( MTP_flags(0), MTP_inputPeerEmpty(), MTP_string(), @@ -404,8 +406,7 @@ BoxController::Row *BoxController::rowForItem(not_null item) std::unique_ptr BoxController::createRow( not_null item) const { - auto row = std::make_unique(item); - return std::move(row); + return std::make_unique(item); } } // namespace Calls diff --git a/Telegram/SourceFiles/calls/calls_box_controller.h b/Telegram/SourceFiles/calls/calls_box_controller.h index 9833469f1..d67e22c04 100644 --- a/Telegram/SourceFiles/calls/calls_box_controller.h +++ b/Telegram/SourceFiles/calls/calls_box_controller.h @@ -15,10 +15,7 @@ class SessionController; namespace Calls { -class BoxController - : public PeerListController - , private base::Subscriber - , private MTP::Sender { +class BoxController : public PeerListController, private base::Subscriber { public: explicit BoxController(not_null window); @@ -44,6 +41,7 @@ private: not_null item) const; const not_null _window; + MTP::Sender _api; MsgId _offsetId = 0; mtpRequestId _loadRequestId = 0; diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index 428ebf94f..bf57bdca4 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/rate_call_box.h" #include "calls/calls_instance.h" #include "base/openssl_help.h" -#include "mtproto/connection.h" +#include "mtproto/mtproto_dh_utils.h" #include "media/audio/media_audio_track.h" #include "base/platform/base_platform_info.h" #include "calls/calls_panel.h" @@ -130,6 +130,7 @@ Call::Call( Type type) : _delegate(delegate) , _user(user) +, _api(_user->session().api().instance()) , _type(type) { _discardByTimeoutTimer.setCallback([this] { hangup(); }); @@ -189,7 +190,7 @@ void Call::startOutgoing() { Expects(_state == State::Requesting); Expects(_gaHash.size() == kSha256Size); - request(MTPphone_RequestCall( + _api.request(MTPphone_RequestCall( MTP_flags(0), _user->inputUser, MTP_int(rand_value()), @@ -236,11 +237,13 @@ void Call::startIncoming() { Expects(_type == Type::Incoming); Expects(_state == State::Starting); - request(MTPphone_ReceivedCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)))).done([this](const MTPBool &result) { + _api.request(MTPphone_ReceivedCall( + MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)) + )).done([=](const MTPBool &result) { if (_state == State::Starting) { setState(State::WaitingIncoming); } - }).fail([this](const RPCError &error) { + }).fail([=](const RPCError &error) { handleRequestError(error); }).send(); } @@ -267,7 +270,7 @@ void Call::actuallyAnswer() { } else { _answerAfterDhConfigReceived = false; } - request(MTPphone_AcceptCall( + _api.request(MTPphone_AcceptCall( MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_gb), MTP_phoneCallProtocol( @@ -504,7 +507,7 @@ void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) { _keyFingerprint = ComputeFingerprint(_authKey); setState(State::ExchangingKeys); - request(MTPphone_ConfirmCall( + _api.request(MTPphone_ConfirmCall( MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_ga), MTP_long(_keyFingerprint), @@ -623,10 +626,10 @@ void Call::createAndStartController(const MTPDphoneCall &call) { _controller->SetEncryptionKey(reinterpret_cast(_authKey.data()), (_type == Type::Outgoing)); _controller->SetCallbacks(callbacks); if (Global::UseProxyForCalls() - && (Global::ProxySettings() == ProxyData::Settings::Enabled)) { + && (Global::ProxySettings() == MTP::ProxyData::Settings::Enabled)) { const auto &proxy = Global::SelectedProxy(); if (proxy.supportsCalls()) { - Assert(proxy.type == ProxyData::Type::Socks5); + Assert(proxy.type == MTP::ProxyData::Type::Socks5); _controller->SetProxy( tgvoip::PROXY_SOCKS5, proxy.host.toStdString(), @@ -840,7 +843,7 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) { auto duration = getDurationMs() / 1000; auto connectionId = _controller ? _controller->GetPreferredRelayID() : 0; _finishByTimeoutTimer.call(kHangupTimeoutMs, [this, finalState] { setState(finalState); }); - request(MTPphone_DiscardCall( + _api.request(MTPphone_DiscardCall( MTP_flags(0), MTP_inputPhoneCall( MTP_long(_id), diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h index 04ade9804..98bc6b5a6 100644 --- a/Telegram/SourceFiles/calls/calls_call.h +++ b/Telegram/SourceFiles/calls/calls_call.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "base/bytes.h" #include "mtproto/sender.h" -#include "mtproto/auth_key.h" +#include "mtproto/mtproto_auth_key.h" namespace Media { namespace Audio { @@ -31,7 +31,7 @@ struct DhConfig { bytes::vector p; }; -class Call : public base::has_weak_ptr, private MTP::Sender { +class Call : public base::has_weak_ptr { public: class Delegate { public: @@ -183,6 +183,7 @@ private: not_null _delegate; not_null _user; + MTP::Sender _api; Type _type = Type::Outgoing; State _state = State::Starting; FinishType _finishAfterRequestingCall = FinishType::None; diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp index 5154c8019..6faaff119 100644 --- a/Telegram/SourceFiles/calls/calls_instance.cpp +++ b/Telegram/SourceFiles/calls/calls_instance.cpp @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "calls/calls_instance.h" -#include "mtproto/connection.h" +#include "mtproto/mtproto_dh_utils.h" #include "core/application.h" #include "main/main_session.h" #include "apiwrap.h" @@ -32,7 +32,9 @@ constexpr auto kServerConfigUpdateTimeoutMs = 24 * 3600 * crl::time(1000); } // namespace -Instance::Instance(not_null session) : _session(session) { +Instance::Instance(not_null session) +: _session(session) +, _api(_session->api().instance()) { } void Instance::startOutgoingCall(not_null user) { @@ -139,7 +141,7 @@ void Instance::refreshDhConfig() { Expects(_currentCall != nullptr); const auto weak = base::make_weak(_currentCall); - request(MTPmessages_GetDhConfig( + _api.request(MTPmessages_GetDhConfig( MTP_int(_dhConfig.version), MTP_int(MTP::ModExpFirst::kRandomPowerSize) )).done([=](const MTPmessages_DhConfig &result) { @@ -203,13 +205,14 @@ void Instance::refreshServerConfig() { if (_lastServerConfigUpdateTime && (crl::now() - _lastServerConfigUpdateTime) < kServerConfigUpdateTimeoutMs) { return; } - _serverConfigRequestId = request(MTPphone_GetCallConfig()).done([this](const MTPDataJSON &result) { + _serverConfigRequestId = _api.request(MTPphone_GetCallConfig( + )).done([=](const MTPDataJSON &result) { _serverConfigRequestId = 0; _lastServerConfigUpdateTime = crl::now(); const auto &json = result.c_dataJSON().vdata().v; UpdateConfig(std::string(json.data(), json.size())); - }).fail([this](const RPCError &error) { + }).fail([=](const RPCError &error) { _serverConfigRequestId = 0; }).send(); } @@ -246,7 +249,7 @@ void Instance::handleCallUpdate(const MTPPhoneCall &call) { LOG(("API Error: Self found in phoneCallRequested.")); } if (alreadyInCall() || !user || user->isSelf()) { - request(MTPphone_DiscardCall( + _api.request(MTPphone_DiscardCall( MTP_flags(0), MTP_inputPhoneCall(phoneCall.vid(), phoneCall.vaccess_hash()), MTP_int(0), diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h index f5d30fa9b..d8987f458 100644 --- a/Telegram/SourceFiles/calls/calls_instance.h +++ b/Telegram/SourceFiles/calls/calls_instance.h @@ -25,8 +25,7 @@ namespace Calls { class Panel; class Instance - : private MTP::Sender - , private Call::Delegate + : private Call::Delegate , private base::Subscriber , public base::has_weak_ptr { public: @@ -74,6 +73,7 @@ private: void handleCallUpdate(const MTPPhoneCall &call); const not_null _session; + MTP::Sender _api; DhConfig _dhConfig; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index a9b4129f0..3f597b931 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -427,7 +427,7 @@ object_ptr EmojiListWidget::createFooter() { Expects(_footer == nullptr); auto result = object_ptr