From 59ecf375b0ca70ee5bfa18d1ded32c86e23acec0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 26 Nov 2018 15:55:02 +0400 Subject: [PATCH] Move tg:// handlers to a separate module. Also move joinGroupByHash and stickerSetBox from MainWidget. --- Telegram/SourceFiles/apiwrap.cpp | 54 ++++ Telegram/SourceFiles/apiwrap.h | 10 + Telegram/SourceFiles/base/qthelp_regex.h | 5 +- .../SourceFiles/boxes/add_contact_box.cpp | 4 +- Telegram/SourceFiles/boxes/confirm_box.cpp | 89 +++--- Telegram/SourceFiles/boxes/confirm_box.h | 11 +- .../SourceFiles/boxes/edit_caption_box.cpp | 6 +- .../boxes/peers/edit_peer_info_box.cpp | 2 +- Telegram/SourceFiles/boxes/rate_call_box.cpp | 13 +- .../SourceFiles/boxes/sticker_set_box.cpp | 8 + Telegram/SourceFiles/boxes/sticker_set_box.h | 2 + Telegram/SourceFiles/calls/calls_call.cpp | 4 +- .../SourceFiles/core/click_handler_types.cpp | 3 +- .../SourceFiles/core/local_url_handlers.cpp | 295 ++++++++++++++++++ .../SourceFiles/core/local_url_handlers.h | 25 ++ Telegram/SourceFiles/facades.cpp | 8 - Telegram/SourceFiles/facades.h | 5 - .../admin_log/history_admin_log_inner.cpp | 7 +- .../history/history_inner_widget.cpp | 7 +- .../history/history_media_types.cpp | 7 +- .../SourceFiles/history/history_message.cpp | 86 +++-- .../SourceFiles/history/history_widget.cpp | 9 +- .../view/history_view_context_menu.cpp | 7 +- Telegram/SourceFiles/mainwidget.cpp | 110 +------ Telegram/SourceFiles/mainwidget.h | 11 - Telegram/SourceFiles/messenger.cpp | 143 +-------- Telegram/SourceFiles/messenger.h | 3 + .../profile/profile_block_group_members.cpp | 3 +- Telegram/SourceFiles/ui/abstract_button.cpp | 4 +- Telegram/gyp/telegram_sources.txt | 2 + 30 files changed, 546 insertions(+), 397 deletions(-) create mode 100644 Telegram/SourceFiles/core/local_url_handlers.cpp create mode 100644 Telegram/SourceFiles/core/local_url_handlers.h diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index a2e566b3a..4cc9b671f 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -338,6 +338,60 @@ void ApiWrap::acceptTerms(bytes::const_span id) { }).send(); } +void ApiWrap::checkChatInvite( + const QString &hash, + FnMut done, + FnMut fail) { + request(base::take(_checkInviteRequestId)).cancel(); + _checkInviteRequestId = request(MTPmessages_CheckChatInvite( + MTP_string(hash) + )).done(std::move(done)).fail(std::move(fail)).send(); +} + +void ApiWrap::importChatInvite(const QString &hash) { + request(MTPmessages_ImportChatInvite( + MTP_string(hash) + )).done([=](const MTPUpdates &result) { + applyUpdates(result); + + Ui::hideLayer(); + const auto handleChats = [&](const MTPVector &chats) { + if (chats.v.isEmpty()) { + return; + } + const auto peerId = chats.v[0].match([](const MTPDchat &data) { + return peerFromChat(data.vid.v); + }, [](const MTPDchannel &data) { + return peerFromChannel(data.vid.v); + }, [](auto&&) { + return PeerId(0); + }); + if (const auto peer = App::peerLoaded(peerId)) { + App::wnd()->controller()->showPeerHistory( + peer, + Window::SectionShow::Way::Forward); + } + }; + result.match([&](const MTPDupdates &data) { + handleChats(data.vchats); + }, [&](const MTPDupdatesCombined &data) { + handleChats(data.vchats); + }, [&](auto &&) { + LOG(("API Error: unexpected update cons %1 " + "(MainWidget::inviteImportDone)").arg(result.type())); + }); + }).fail([=](const RPCError &error) { + const auto type = error.type(); + if (type == qstr("CHANNELS_TOO_MUCH")) { + Ui::show(Box(lang(lng_join_channel_error))); + } else if (error.code() == 400) { + Ui::show(Box(lang(type == qstr("USERS_TOO_MUCH") + ? lng_group_invite_no_room + : lng_group_invite_bad_link))); + } + }).send(); +} + void ApiWrap::applyUpdates( const MTPUpdates &updates, uint64 sentMessageRandomId) { diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index a17c32581..45a62c9c5 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -125,6 +125,12 @@ public: void requestTermsUpdate(); void acceptTerms(bytes::const_span termsId); + void checkChatInvite( + const QString &hash, + FnMut done, + FnMut fail); + void importChatInvite(const QString &hash); + void requestChannelMembersForAdd( not_null channel, Fn callback); @@ -708,6 +714,10 @@ private: TimeMs _termsUpdateSendAt = 0; mtpRequestId _termsUpdateRequestId = 0; + mtpRequestId _checkInviteRequestId = 0; + FnMut _checkInviteDone; + FnMut _checkInviteFail; + std::vector> _supportContactCallbacks; base::flat_map> _peerPhotoUploads; diff --git a/Telegram/SourceFiles/base/qthelp_regex.h b/Telegram/SourceFiles/base/qthelp_regex.h index 410888432..09441a74e 100644 --- a/Telegram/SourceFiles/base/qthelp_regex.h +++ b/Telegram/SourceFiles/base/qthelp_regex.h @@ -35,9 +35,12 @@ public: const QRegularExpressionMatch *operator->() const { return &data_; } - explicit operator bool() const { + bool valid() const { return data_.hasMatch(); } + explicit operator bool() const { + return valid(); + } private: QRegularExpressionMatch data_; diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index 4511ff6c5..46e914a47 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -437,7 +437,7 @@ void GroupInfoBox::createGroup( auto image = _photo->takeResultImage(); Ui::hideLayer(); - App::main()->sentUpdatesReceived(result); + Auth().api().applyUpdates(result); auto success = base::make_optional(&result) | [](auto updates) -> std::optional*> { @@ -542,7 +542,7 @@ void GroupInfoBox::createChannel(const QString &title, const QString &descriptio bool mega = false; auto flags = mega ? MTPchannels_CreateChannel::Flag::f_megagroup : MTPchannels_CreateChannel::Flag::f_broadcast; _creationRequestId = request(MTPchannels_CreateChannel(MTP_flags(flags), MTP_string(title), MTP_string(description))).done([this](const MTPUpdates &result) { - App::main()->sentUpdatesReceived(result); + Auth().api().applyUpdates(result); auto success = base::make_optional(&result) | [](auto updates) -> std::optional*> { diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index cf5f7988b..82897244b 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace { void ConvertToSupergroupDone(const MTPUpdates &updates) { - App::main()->sentUpdatesReceived(updates); + Auth().api().applyUpdates(updates); auto handleChats = [](const MTPVector &chats) { for (const auto &chat : chats.v) { @@ -478,9 +478,7 @@ void PinMessageBox::pinMessage() { } void PinMessageBox::pinDone(const MTPUpdates &updates) { - if (App::main()) { - App::main()->sentUpdatesReceived(updates); - } + Auth().api().applyUpdates(updates); Ui::hideLayer(); } @@ -617,10 +615,6 @@ void DeleteMessagesBox::keyPressEvent(QKeyEvent *e) { } void DeleteMessagesBox::deleteAndClear() { - if (!App::main()) { - return; - } - if (_moderateFrom) { if (_banUser && _banUser->checked()) { Auth().api().kickParticipant( @@ -672,38 +666,43 @@ void DeleteMessagesBox::deleteAndClear() { ConfirmInviteBox::ConfirmInviteBox( QWidget*, - const QString &title, - bool isChannel, - const MTPChatPhoto &photo, - int count, - const QVector &participants) -: _title(this, st::confirmInviteTitle) + const MTPDchatInvite &data, + Fn submit) +: _submit(std::move(submit)) +, _title(this, st::confirmInviteTitle) , _status(this, st::confirmInviteStatus) -, _participants(participants) -, _isChannel(isChannel) { - _title->setText(title); - QString status; - if (_participants.isEmpty() || _participants.size() >= count) { - if (count > 0) { - status = lng_chat_status_members(lt_count, count); +, _participants(GetParticipants(data)) +, _isChannel(data.is_channel() && !data.is_megagroup()) { + const auto title = qs(data.vtitle); + const auto count = data.vparticipants_count.v; + const auto status = [&] { + if (_participants.empty() || _participants.size() >= count) { + if (count > 0) { + return lng_chat_status_members(lt_count, count); + } else { + return lang(_isChannel + ? lng_channel_status + : lng_group_status); + } } else { - status = lang(isChannel ? lng_channel_status : lng_group_status); + return lng_group_invite_members(lt_count, count); } - } else { - status = lng_group_invite_members(lt_count, count); - } + }(); + _title->setText(title); _status->setText(status); - if (photo.type() == mtpc_chatPhoto) { - const auto &data = photo.c_chatPhoto(); + if (data.vphoto.type() == mtpc_chatPhoto) { + const auto &photo = data.vphoto.c_chatPhoto(); const auto size = 160; const auto location = StorageImageLocation::FromMTP( size, size, - data.vphoto_small); + photo.vphoto_small); if (!location.isNull()) { _photo = Images::Create(location); if (!_photo->loaded()) { - subscribe(Auth().downloaderTaskFinished(), [this] { update(); }); + subscribe(Auth().downloaderTaskFinished(), [=] { + update(); + }); _photo->load(Data::FileOrigin()); } } @@ -715,29 +714,41 @@ ConfirmInviteBox::ConfirmInviteBox( } } +std::vector> ConfirmInviteBox::GetParticipants( + const MTPDchatInvite &data) { + if (!data.has_participants()) { + return {}; + } + const auto &v = data.vparticipants.v; + auto result = std::vector>(); + result.reserve(v.size()); + for (const auto &participant : v) { + if (const auto user = App::feedUser(participant)) { + result.push_back(user); + } + } + return result; +} + void ConfirmInviteBox::prepare() { const auto joinKey = _isChannel ? lng_profile_join_channel : lng_profile_join_group; - addButton(langFactory(joinKey), [] { - if (auto main = App::main()) { - main->onInviteImport(); - } - }); - addButton(langFactory(lng_cancel), [this] { closeBox(); }); + addButton(langFactory(joinKey), _submit); + addButton(langFactory(lng_cancel), [=] { closeBox(); }); - if (_participants.size() > 4) { - _participants.resize(4); + while (_participants.size() > 4) { + _participants.pop_back(); } auto newHeight = st::confirmInviteStatusTop + _status->height() + st::boxPadding.bottom(); - if (!_participants.isEmpty()) { + if (!_participants.empty()) { int skip = (st::boxWideWidth - 4 * st::confirmInviteUserPhotoSize) / 5; int padding = skip / 2; _userWidth = (st::confirmInviteUserPhotoSize + 2 * padding); int sumWidth = _participants.size() * _userWidth; int left = (st::boxWideWidth - sumWidth) / 2; - for_const (auto user, _participants) { + for (const auto user : _participants) { auto name = new Ui::FlatLabel(this, st::confirmInviteUserName); name->resizeToWidth(st::confirmInviteUserPhotoSize + padding); name->setText(user->firstName.isEmpty() ? App::peerName(user) : user->firstName); diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h index 19ea8a935..3f6c9c611 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.h +++ b/Telegram/SourceFiles/boxes/confirm_box.h @@ -205,7 +205,10 @@ private: class ConfirmInviteBox : public BoxContent, public RPCSender { public: - ConfirmInviteBox(QWidget*, const QString &title, bool isChannel, const MTPChatPhoto &photo, int count, const QVector &participants); + ConfirmInviteBox( + QWidget*, + const MTPDchatInvite &data, + Fn submit); ~ConfirmInviteBox(); protected: @@ -215,11 +218,15 @@ protected: void paintEvent(QPaintEvent *e) override; private: + static std::vector> GetParticipants( + const MTPDchatInvite &data); + + Fn _submit; object_ptr _title; object_ptr _status; ImagePtr _photo; std::unique_ptr _photoEmpty; - QVector _participants; + std::vector> _participants; bool _isChannel = false; int _userWidth = 0; diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index dd4ff36a2..ba3a2997a 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -24,9 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "chat_helpers/tabbed_selector.h" #include "chat_helpers/emoji_suggestions_widget.h" #include "window/window_controller.h" -#include "mainwidget.h" #include "layout.h" #include "auth_session.h" +#include "apiwrap.h" #include "styles/style_history.h" #include "styles/style_boxes.h" #include "styles/style_chat_helpers.h" @@ -509,9 +509,7 @@ void EditCaptionBox::save() { void EditCaptionBox::saveDone(const MTPUpdates &updates) { _saveRequestId = 0; closeBox(); - if (App::main()) { - App::main()->sentUpdatesReceived(updates); - } + Auth().api().applyUpdates(updates); } bool EditCaptionBox::saveFail(const RPCError &error) { diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index b2a853bf7..d6491c914 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -671,7 +671,7 @@ bool Controller::canEditInviteLink() const { } return (!channel->isPublic() && channel->canAddMembers()); } else if (auto chat = _peer->asChat()) { - return !chat->inviteLink().isEmpty() || chat->canEdit(); + return !chat->inviteLink().isEmpty() || chat->amCreator(); } return false; } diff --git a/Telegram/SourceFiles/boxes/rate_call_box.cpp b/Telegram/SourceFiles/boxes/rate_call_box.cpp index caed8ee91..93909e028 100644 --- a/Telegram/SourceFiles/boxes/rate_call_box.cpp +++ b/Telegram/SourceFiles/boxes/rate_call_box.cpp @@ -15,7 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "mainwindow.h" -#include "mainwidget.h" +#include "auth_session.h" +#include "apiwrap.h" namespace { @@ -114,10 +115,14 @@ void RateCallBox::send() { return; } auto comment = _comment ? _comment->getLastText().trimmed() : QString(); - _requestId = request(MTPphone_SetCallRating(MTP_inputPhoneCall(MTP_long(_callId), MTP_long(_callAccessHash)), MTP_int(_rating), MTP_string(comment))).done([this](const MTPUpdates &updates) { - App::main()->sentUpdatesReceived(updates); + _requestId = request(MTPphone_SetCallRating( + MTP_inputPhoneCall(MTP_long(_callId), MTP_long(_callAccessHash)), + MTP_int(_rating), + MTP_string(comment) + )).done([=](const MTPUpdates &updates) { + Auth().api().applyUpdates(updates); closeBox(); - }).fail([this](const RPCError &error) { closeBox(); }).send(); + }).fail([=](const RPCError &error) { closeBox(); }).send(); } void RateCallBox::updateMaxHeight() { diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 7a50cf7c7..0fbe11f60 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -103,6 +103,14 @@ StickerSetBox::StickerSetBox(QWidget*, const MTPInputStickerSet &set) : _set(set) { } +void StickerSetBox::Show(DocumentData *document) { + if (const auto sticker = document ? document->sticker() : nullptr) { + if (sticker->set.type() != mtpc_inputStickerSetEmpty) { + Ui::show(Box(sticker->set)); + } + } +} + void StickerSetBox::prepare() { setTitle(langFactory(lng_contacts_loading)); diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h index 4c0c060c5..9d1330669 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.h +++ b/Telegram/SourceFiles/boxes/sticker_set_box.h @@ -21,6 +21,8 @@ class StickerSetBox : public BoxContent, public RPCSender { public: StickerSetBox(QWidget*, const MTPInputStickerSet &set); + static void Show(DocumentData *document); + protected: void prepare() override; diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index ac7bd39ff..30f1fadc8 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_call.h" #include "auth_session.h" -#include "mainwidget.h" +#include "apiwrap.h" #include "lang/lang_keys.h" #include "boxes/confirm_box.h" #include "boxes/rate_call_box.h" @@ -788,7 +788,7 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) { // This could be destroyed by updates, so we set Ended after // updates being handled, but in a guarded way. crl::on_main(this, [=] { setState(finalState); }); - App::main()->sentUpdatesReceived(result); + Auth().api().applyUpdates(result); }).fail([this, finalState](const RPCError &error) { setState(finalState); }).send(); diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index cb8768d04..a18d57937 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "messenger.h" +#include "mainwidget.h" #include "application.h" #include "platform/platform_specific.h" #include "history/view/history_view_element.h" @@ -231,7 +232,7 @@ QString MentionClickHandler::copyToClipboardContextItemText() const { void MentionClickHandler::onClick(ClickContext context) const { const auto button = context.button; if (button == Qt::LeftButton || button == Qt::MiddleButton) { - App::openPeerByName(_tag.mid(1), ShowAtProfileMsgId); + App::main()->openPeerByName(_tag.mid(1), ShowAtProfileMsgId); } } diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp new file mode 100644 index 000000000..0740d8d15 --- /dev/null +++ b/Telegram/SourceFiles/core/local_url_handlers.cpp @@ -0,0 +1,295 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. + +For license and copyright information please follow this link: +https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +*/ +#include "core/local_url_handlers.h" + +#include "base/qthelp_regex.h" +#include "base/qthelp_url.h" +#include "lang/lang_cloud_manager.h" +#include "lang/lang_keys.h" +#include "core/update_checker.h" +#include "boxes/confirm_phone_box.h" +#include "boxes/confirm_box.h" +#include "boxes/share_box.h" +#include "boxes/connection_box.h" +#include "boxes/sticker_set_box.h" +#include "passport/passport_form_controller.h" +#include "window/window_controller.h" +#include "mainwindow.h" +#include "mainwidget.h" +#include "messenger.h" +#include "auth_session.h" +#include "apiwrap.h" + +namespace Core { +namespace { + +using Match = qthelp::RegularExpressionMatch; + +bool JoinGroupByHash(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + const auto hash = match->captured(1); + Auth().api().checkChatInvite(hash, [=](const MTPChatInvite &result) { + Messenger::Instance().hideMediaView(); + result.match([=](const MTPDchatInvite &data) { + Ui::show(Box(data, [=] { + Auth().api().importChatInvite(hash); + })); + }, [=](const MTPDchatInviteAlready &data) { + if (const auto chat = App::feedChat(data.vchat)) { + App::wnd()->controller()->showPeerHistory( + chat, + Window::SectionShow::Way::Forward); + } + }); + }, [=](const RPCError &error) { + if (error.code() != 400) { + return; + } + Messenger::Instance().hideMediaView(); + Ui::show(Box(lang(lng_group_invite_bad_link))); + }); + return true; +} + +bool ShowStickerSet(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + Messenger::Instance().hideMediaView(); + Ui::show(Box( + MTP_inputStickerSetShortName(MTP_string(match->captured(1))))); + return true; +} + +bool SetLanguage(const Match &match, const QVariant &context) { + const auto languageId = match->captured(1); + Lang::CurrentCloudManager().switchWithWarning(languageId); + return true; +} + +bool ShareUrl(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + auto url = params.value(qsl("url")); + if (url.isEmpty()) { + return false; + } + App::main()->shareUrlLayer(url, params.value("text")); + return true; +} + +bool ConfirmPhone(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + auto phone = params.value(qsl("phone")); + auto hash = params.value(qsl("hash")); + if (phone.isEmpty() || hash.isEmpty()) { + return false; + } + ConfirmPhoneBox::start(phone, hash); + return true; +} + +bool ShareGameScore(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + const auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + ShareGameScoreByHash(params.value(qsl("hash"))); + return true; +} + +bool ApplySocksProxy(const Match &match, const QVariant &context) { + auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + ProxiesBoxController::ShowApplyConfirmation(ProxyData::Type::Socks5, params); + return true; +} + +bool ApplyMtprotoProxy(const Match &match, const QVariant &context) { + auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + ProxiesBoxController::ShowApplyConfirmation(ProxyData::Type::Mtproto, params); + return true; +} + +bool ShowPassportForm(const QMap ¶ms) { + const auto botId = params.value("bot_id", QString()).toInt(); + const auto scope = params.value("scope", QString()); + const auto callback = params.value("callback_url", QString()); + const auto publicKey = params.value("public_key", QString()); + const auto nonce = params.value( + Passport::NonceNameByScope(scope), + QString()); + const auto errors = params.value("errors", QString()); + if (const auto window = App::wnd()) { + if (const auto controller = window->controller()) { + controller->showPassportForm(Passport::FormRequest( + botId, + scope, + callback, + publicKey, + nonce, + errors)); + return true; + } + } + return false; +} + +bool ShowPassport(const Match &match, const QVariant &context) { + return ShowPassportForm(url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower)); +} + +bool ResolveUsername(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + auto params = url_parse_params( + match->captured(1), + qthelp::UrlParamNameTransform::ToLower); + const auto domain = params.value(qsl("domain")); + const auto valid = [](const QString &domain) { + return qthelp::regex_match( + qsl("^[a-z0-9\\.\\_]+$"), + domain, + {} + ).valid(); + }; + if (domain == qsl("telegrampassport")) { + return ShowPassportForm(params); + } else if (!valid(domain)) { + return false; + } + auto start = qsl("start"); + auto startToken = params.value(start); + if (startToken.isEmpty()) { + start = qsl("startgroup"); + startToken = params.value(start); + if (startToken.isEmpty()) { + start = QString(); + } + } + auto post = (start == qsl("startgroup")) ? ShowAtProfileMsgId : ShowAtUnreadMsgId; + auto postParam = params.value(qsl("post")); + if (auto postId = postParam.toInt()) { + post = postId; + } + auto gameParam = params.value(qsl("game")); + if (!gameParam.isEmpty() && valid(gameParam)) { + startToken = gameParam; + post = ShowAtGameShareMsgId; + } + const auto clickFromMessageId = context.value(); + App::main()->openPeerByName( + domain, + post, + startToken, + clickFromMessageId); + return true; +} + +bool HandleUnknown(const Match &match, const QVariant &context) { + if (!AuthSession::Exists()) { + return false; + } + const auto request = match->captured(1); + const auto callback = [=](const MTPDhelp_deepLinkInfo &result) { + const auto text = TextWithEntities{ + qs(result.vmessage), + (result.has_entities() + ? TextUtilities::EntitiesFromMTP(result.ventities.v) + : EntitiesInText()) + }; + if (result.is_update_app()) { + const auto box = std::make_shared>(); + const auto callback = [=] { + Core::UpdateApplication(); + if (*box) (*box)->closeBox(); + }; + *box = Ui::show(Box( + text, + lang(lng_menu_update), + callback)); + } else { + Ui::show(Box(text)); + } + }; + Auth().api().requestDeepLinkInfo(request, callback); + return true; +} + +} // namespace + +const std::vector &LocalUrlHandlers() { + static auto Result = std::vector{ + { + qsl("^join/?\\?invite=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"), + JoinGroupByHash + }, + { + qsl("^addstickers/?\\?set=([a-zA-Z0-9\\.\\_]+)(&|$)"), + ShowStickerSet + }, + { + qsl("^setlanguage/?\\?lang=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"), + SetLanguage + }, + { + qsl("^msg_url/?\\?(.+)(#|$)"), + ShareUrl + }, + { + qsl("^confirmphone/?\\?(.+)(#|$)"), + ConfirmPhone + }, + { + qsl("^share_game_score/?\\?(.+)(#|$)"), + ShareGameScore + }, + { + qsl("^socks/?\\?(.+)(#|$)"), + ApplySocksProxy + }, + { + qsl("^proxy/?\\?(.+)(#|$)"), + ApplyMtprotoProxy + }, + { + qsl("^passport/?\\?(.+)(#|$)"), + ShowPassport + }, + { + qsl("^resolve/?\\?(.+)(#|$)"), + ResolveUsername + }, + { + qsl("^([^\\?]+)(\\?|#|$)"), + HandleUnknown + } + }; + return Result; +} + +} // namespace Core diff --git a/Telegram/SourceFiles/core/local_url_handlers.h b/Telegram/SourceFiles/core/local_url_handlers.h new file mode 100644 index 000000000..c1084e522 --- /dev/null +++ b/Telegram/SourceFiles/core/local_url_handlers.h @@ -0,0 +1,25 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. + +For license and copyright information please follow this link: +https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +*/ +#pragma once + +namespace qthelp { +class RegularExpressionMatch; +} // namespace qthelp + +namespace Core { + +struct LocalUrlHandler { + QString expression; + Fn handler; +}; + +const std::vector &LocalUrlHandlers(); + +} // namespace Core diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index ee2ba88bf..ded40fb49 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -163,14 +163,6 @@ void searchByHashtag(const QString &tag, PeerData *inPeer) { } } -void openPeerByName(const QString &username, MsgId msgId, const QString &startToken) { - if (MainWidget *m = main()) m->openPeerByName(username, msgId, startToken); -} - -void joinGroupByHash(const QString &hash) { - if (MainWidget *m = main()) m->joinGroupByHash(hash); -} - void showSettings() { if (auto w = wnd()) { w->showSettings(); diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 2396a4df8..d90440f18 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -67,11 +67,6 @@ void activateBotCommand( int row, int column); void searchByHashtag(const QString &tag, PeerData *inPeer); -void openPeerByName( - const QString &username, - MsgId msgId = ShowAtUnreadMsgId, - const QString &startToken = QString()); -void joinGroupByHash(const QString &hash); void showSettings(); void activateClickHandler(ClickHandlerPtr handler, ClickContext context); 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 4f0051f04..5fab1052f 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "history/view/history_view_service_message.h" #include "history/view/history_view_cursor_state.h" #include "chat_helpers/message_field.h" +#include "boxes/sticker_set_box.h" #include "mainwindow.h" #include "mainwidget.h" #include "messenger.h" @@ -1114,11 +1115,7 @@ void InnerWidget::copySelectedText() { } void InnerWidget::showStickerPackInfo(not_null document) { - if (auto sticker = document->sticker()) { - if (sticker->set.type() != mtpc_inputStickerSetEmpty) { - App::main()->stickersBox(sticker->set); - } - } + StickerSetBox::Show(document); } void InnerWidget::cancelContextDownload(not_null document) { diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index cc9f80e5f..2880e34e2 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_peer_menu.h" #include "boxes/confirm_box.h" #include "boxes/report_box.h" +#include "boxes/sticker_set_box.h" #include "chat_helpers/message_field.h" #include "chat_helpers/stickers.h" #include "history/history_widget.h" @@ -1769,11 +1770,7 @@ void HistoryInner::copyContextImage(not_null photo) { } void HistoryInner::showStickerPackInfo(not_null document) { - if (auto sticker = document->sticker()) { - if (sticker->set.type() != mtpc_inputStickerSetEmpty) { - App::main()->stickersBox(sticker->set); - } - } + StickerSetBox::Show(document); } void HistoryInner::cancelContextDownload(not_null document) { diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index bbacafff4..041d6255e 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/view/media_clip_playback.h" #include "boxes/confirm_box.h" #include "boxes/add_contact_box.h" +#include "boxes/sticker_set_box.h" #include "core/click_handler_types.h" #include "history/history.h" #include "history/history_item_components.h" @@ -2923,11 +2924,7 @@ QSize HistorySticker::countOptimalSize() { if (!_packLink && sticker && sticker->set.type() != mtpc_inputStickerSetEmpty) { _packLink = std::make_shared([document = _data] { - if (auto sticker = document->sticker()) { - if (sticker->set.type() != mtpc_inputStickerSetEmpty && App::main()) { - App::main()->stickersBox(sticker->set); - } - } + StickerSetBox::Show(document); }); } _pixw = _data->dimensions.width(); diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index 36fe629df..45569706d 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -100,24 +100,22 @@ void FastShareMessage(not_null item) { const auto canCopyLink = item->hasDirectLink() || isGame; auto copyCallback = [data]() { - if (auto main = App::main()) { - if (auto item = App::histItemById(data->msgIds[0])) { - if (item->hasDirectLink()) { - QApplication::clipboard()->setText(item->directLink()); + if (auto item = App::histItemById(data->msgIds[0])) { + if (item->hasDirectLink()) { + QApplication::clipboard()->setText(item->directLink()); - Ui::Toast::Show(lang(lng_channel_public_link_copied)); - } else if (const auto bot = item->getMessageBot()) { - if (const auto media = item->media()) { - if (const auto game = media->game()) { - const auto link = Messenger::Instance().createInternalLinkFull( - bot->username - + qsl("?game=") - + game->shortName); + Ui::Toast::Show(lang(lng_channel_public_link_copied)); + } else if (const auto bot = item->getMessageBot()) { + if (const auto media = item->media()) { + if (const auto game = media->game()) { + const auto link = Messenger::Instance().createInternalLinkFull( + bot->username + + qsl("?game=") + + game->shortName); - QApplication::clipboard()->setText(link); + QApplication::clipboard()->setText(link); - Ui::Toast::Show(lang(lng_share_game_link_copied)); - } + Ui::Toast::Show(lang(lng_share_game_link_copied)); } } } @@ -156,9 +154,7 @@ void FastShareMessage(not_null item) { } auto doneCallback = [data](const MTPUpdates &updates, mtpRequestId requestId) { - if (auto main = App::main()) { - main->sentUpdatesReceived(updates); - } + Auth().api().applyUpdates(updates); data->requests.remove(requestId); if (data->requests.empty()) { Ui::Toast::Show(lang(lng_share_done)); @@ -183,35 +179,33 @@ void FastShareMessage(not_null item) { } return result; }; - if (auto main = App::main()) { - for (const auto peer : result) { - if (!GetErrorTextForForward(peer, items).isEmpty()) { - continue; - } - - const auto history = App::history(peer); - if (!comment.text.isEmpty()) { - auto message = ApiWrap::MessageToSend(history); - message.textWithTags = comment; - message.clearDraft = false; - Auth().api().sendMessage(std::move(message)); - } - auto request = MTPmessages_ForwardMessages( - MTP_flags(sendFlags), - data->peer->input, - MTP_vector(msgIds), - MTP_vector(generateRandom()), - peer->input); - auto callback = doneCallback; - history->sendRequestId = MTP::send( - request, - rpcDone(base::duplicate(doneCallback)), - nullptr, - 0, - 0, - history->sendRequestId); - data->requests.insert(history->sendRequestId); + for (const auto peer : result) { + if (!GetErrorTextForForward(peer, items).isEmpty()) { + continue; } + + const auto history = App::history(peer); + if (!comment.text.isEmpty()) { + auto message = ApiWrap::MessageToSend(history); + message.textWithTags = comment; + message.clearDraft = false; + Auth().api().sendMessage(std::move(message)); + } + auto request = MTPmessages_ForwardMessages( + MTP_flags(sendFlags), + data->peer->input, + MTP_vector(msgIds), + MTP_vector(generateRandom()), + peer->input); + auto callback = doneCallback; + history->sendRequestId = MTP::send( + request, + rpcDone(base::duplicate(doneCallback)), + nullptr, + 0, + 0, + history->sendRequestId); + data->requests.insert(history->sendRequestId); } }; auto filterCallback = [isGame](PeerData *peer) { diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index ce8f1f144..524c0fb32 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -3030,9 +3030,7 @@ void HistoryWidget::saveEditMsg() { } void HistoryWidget::saveEditMsgDone(History *history, const MTPUpdates &updates, mtpRequestId req) { - if (App::main()) { - App::main()->sentUpdatesReceived(updates); - } + Auth().api().applyUpdates(updates); if (req == _saveEditMsgRequestId) { _saveEditMsgRequestId = 0; cancelEdit(); @@ -4778,6 +4776,7 @@ void HistoryWidget::onReportSpamHide() { void HistoryWidget::onReportSpamClear() { Expects(_peer != nullptr); + InvokeQueued(App::main(), [peer = _peer] { if (peer->isUser()) { App::main()->deleteConversation(peer); @@ -5967,9 +5966,7 @@ void HistoryWidget::unpinMessage(FullMsgId itemId) { } void HistoryWidget::unpinDone(const MTPUpdates &updates) { - if (App::main()) { - App::main()->sentUpdatesReceived(updates); - } + Auth().api().applyUpdates(updates); } void HistoryWidget::onPinnedHide() { diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp index 416fe353a..e8e0e6817 100644 --- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp +++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp @@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/image/image.h" #include "chat_helpers/message_field.h" #include "boxes/confirm_box.h" +#include "boxes/sticker_set_box.h" #include "data/data_photo.h" #include "data/data_document.h" #include "data/data_media_types.h" @@ -71,11 +72,7 @@ void CopyImage(not_null photo) { } void ShowStickerPackInfo(not_null document) { - if (const auto sticker = document->sticker()) { - if (sticker->set.type() != mtpc_inputStickerSetEmpty) { - App::main()->stickersBox(sticker->set); - } - } + StickerSetBox::Show(document); } void ToggleFavedSticker( diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 99c1a5947..a94d0384d 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -3404,16 +3404,6 @@ void MainWidget::openPeerByName( } } -void MainWidget::joinGroupByHash(const QString &hash) { - Messenger::Instance().hideMediaView(); - MTP::send(MTPmessages_CheckChatInvite(MTP_string(hash)), rpcDone(&MainWidget::inviteCheckDone, hash), rpcFail(&MainWidget::inviteCheckFail)); -} - -void MainWidget::stickersBox(const MTPInputStickerSet &set) { - Messenger::Instance().hideMediaView(); - Ui::show(Box(set)); -} - void MainWidget::onSelfParticipantUpdated(ChannelData *channel) { auto history = App::historyLoaded(channel->id); if (_updatedChannels.contains(channel)) { @@ -3495,102 +3485,12 @@ bool MainWidget::usernameResolveFail(QString name, const RPCError &error) { return true; } -void MainWidget::inviteCheckDone(QString hash, const MTPChatInvite &invite) { - switch (invite.type()) { - case mtpc_chatInvite: { - auto &d = invite.c_chatInvite(); - - auto participants = QVector(); - if (d.has_participants()) { - auto &v = d.vparticipants.v; - participants.reserve(v.size()); - for_const (auto &user, v) { - if (auto feededUser = App::feedUser(user)) { - participants.push_back(feededUser); - } - } - } - _inviteHash = hash; - auto box = Box( - qs(d.vtitle), - d.is_channel() && !d.is_megagroup(), - d.vphoto, - d.vparticipants_count.v, - participants); - Ui::show(std::move(box)); - } break; - - case mtpc_chatInviteAlready: { - auto &d = invite.c_chatInviteAlready(); - if (auto chat = App::feedChat(d.vchat)) { - _controller->showPeerHistory( - chat, - SectionShow::Way::Forward); - } - } break; - } -} - -bool MainWidget::inviteCheckFail(const RPCError &error) { - if (MTP::isDefaultHandledError(error)) return false; - - if (error.code() == 400) { - Ui::show(Box(lang(lng_group_invite_bad_link))); - } - return true; -} - -void MainWidget::onInviteImport() { - if (_inviteHash.isEmpty()) return; - MTP::send( - MTPmessages_ImportChatInvite(MTP_string(_inviteHash)), - rpcDone(&MainWidget::inviteImportDone), - rpcFail(&MainWidget::inviteImportFail)); -} - -void MainWidget::inviteImportDone(const MTPUpdates &updates) { - App::main()->sentUpdatesReceived(updates); - - Ui::hideLayer(); - const QVector *v = 0; - switch (updates.type()) { - case mtpc_updates: v = &updates.c_updates().vchats.v; break; - case mtpc_updatesCombined: v = &updates.c_updatesCombined().vchats.v; break; - default: LOG(("API Error: unexpected update cons %1 (MainWidget::inviteImportDone)").arg(updates.type())); break; - } - if (v && !v->isEmpty()) { - const auto &mtpChat = v->front(); - const auto peerId = [&] { - if (mtpChat.type() == mtpc_chat) { - return peerFromChat(mtpChat.c_chat().vid.v); - } else if (mtpChat.type() == mtpc_channel) { - return peerFromChannel(mtpChat.c_channel().vid.v); - } - return PeerId(0); - }(); - if (const auto peer = App::peerLoaded(peerId)) { - _controller->showPeerHistory( - peer, - SectionShow::Way::Forward); - } - } -} - -bool MainWidget::inviteImportFail(const RPCError &error) { - if (MTP::isDefaultHandledError(error)) return false; - - if (error.type() == qstr("CHANNELS_TOO_MUCH")) { - Ui::show(Box(lang(lng_join_channel_error))); - } else if (error.code() == 400) { - Ui::show(Box(lang(error.type() == qstr("USERS_TOO_MUCH") ? lng_group_invite_no_room : lng_group_invite_bad_link))); - } - - return true; -} - void MainWidget::incrementSticker(DocumentData *sticker) { - if (!sticker || !sticker->sticker()) return; - if (sticker->sticker()->set.type() == mtpc_inputStickerSetEmpty) return; + if (!sticker + || !sticker->sticker() + || sticker->sticker()->set.type() == mtpc_inputStickerSetEmpty) { + return; + } bool writeRecentStickers = false; auto &sets = Auth().data().stickerSetsRef(); diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index e3165ed7c..6df0923c6 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -106,8 +106,6 @@ public: MsgId msgId = ShowAtUnreadMsgId, const QString &startToken = QString(), FullMsgId clickFromMessageId = FullMsgId()); - void joinGroupByHash(const QString &hash); - void stickersBox(const MTPInputStickerSet &set); bool started(); @@ -333,8 +331,6 @@ public slots: void onCacheBackground(); - void onInviteImport(); - void onViewsIncrement(); protected: @@ -440,11 +436,6 @@ private: void usernameResolveDone(QPair msgIdAndStartToken, const MTPcontacts_ResolvedPeer &result); bool usernameResolveFail(QString name, const RPCError &error); - void inviteCheckDone(QString hash, const MTPChatInvite &invite); - bool inviteCheckFail(const RPCError &error); - void inviteImportDone(const MTPUpdates &result); - bool inviteImportFail(const RPCError &error); - int getMainSectionTop() const; int getThirdSectionTop() const; @@ -481,8 +472,6 @@ private: not_null _controller; bool _started = false; - QString _inviteHash; - Animation _a_show; bool _showBack = false; QPixmap _cacheUnder, _cacheOver; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 2f108cd92..8a58573ae 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "core/update_checker.h" #include "core/shortcuts.h" +#include "core/local_url_handlers.h" #include "storage/localstorage.h" #include "platform/platform_specific.h" #include "mainwindow.h" @@ -26,8 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_translator.h" #include "lang/lang_cloud_manager.h" #include "lang/lang_hardcoded.h" -#include "core/update_checker.h" -#include "passport/passport_form_controller.h" #include "observer_peer.h" #include "storage/storage_databases.h" #include "mainwidget.h" @@ -799,142 +798,12 @@ bool Messenger::openLocalUrl(const QString &url, QVariant context) { } auto command = urlTrimmed.midRef(protocol.size()); - const auto showPassportForm = [](const QMap ¶ms) { - const auto botId = params.value("bot_id", QString()).toInt(); - const auto scope = params.value("scope", QString()); - const auto callback = params.value("callback_url", QString()); - const auto publicKey = params.value("public_key", QString()); - const auto nonce = params.value( - Passport::NonceNameByScope(scope), - QString()); - const auto errors = params.value("errors", QString()); - if (const auto window = App::wnd()) { - if (const auto controller = window->controller()) { - controller->showPassportForm(Passport::FormRequest( - botId, - scope, - callback, - publicKey, - nonce, - errors)); - return true; - } - } - return false; - }; - using namespace qthelp; - auto matchOptions = RegExOption::CaseInsensitive; - if (auto joinChatMatch = regex_match(qsl("^join/?\\?invite=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"), command, matchOptions)) { - if (auto main = App::main()) { - main->joinGroupByHash(joinChatMatch->captured(1)); - return true; - } - } else if (auto stickerSetMatch = regex_match(qsl("^addstickers/?\\?set=([a-zA-Z0-9\\.\\_]+)(&|$)"), command, matchOptions)) { - if (auto main = App::main()) { - main->stickersBox(MTP_inputStickerSetShortName(MTP_string(stickerSetMatch->captured(1)))); - return true; - } - } else if (auto languageMatch = regex_match(qsl("^setlanguage/?\\?lang=([a-zA-Z0-9\\.\\_\\-]+)(&|$)"), command, matchOptions)) { - const auto langId = languageMatch->captured(1); - Lang::CurrentCloudManager().switchWithWarning(langId); - } else if (auto shareUrlMatch = regex_match(qsl("^msg_url/?\\?(.+)(#|$)"), command, matchOptions)) { - if (auto main = App::main()) { - auto params = url_parse_params(shareUrlMatch->captured(1), UrlParamNameTransform::ToLower); - auto url = params.value(qsl("url")); - if (!url.isEmpty()) { - main->shareUrlLayer(url, params.value("text")); - return true; - } - } - } else if (auto confirmPhoneMatch = regex_match(qsl("^confirmphone/?\\?(.+)(#|$)"), command, matchOptions)) { - if (auto main = App::main()) { - auto params = url_parse_params(confirmPhoneMatch->captured(1), UrlParamNameTransform::ToLower); - auto phone = params.value(qsl("phone")); - auto hash = params.value(qsl("hash")); - if (!phone.isEmpty() && !hash.isEmpty()) { - ConfirmPhoneBox::start(phone, hash); - return true; - } - } - } else if (auto usernameMatch = regex_match(qsl("^resolve/?\\?(.+)(#|$)"), command, matchOptions)) { - if (auto main = App::main()) { - auto params = url_parse_params(usernameMatch->captured(1), UrlParamNameTransform::ToLower); - auto domain = params.value(qsl("domain")); - if (domain == qsl("telegrampassport")) { - return showPassportForm(params); - } else if (regex_match(qsl("^[a-zA-Z0-9\\.\\_]+$"), domain, matchOptions)) { - auto start = qsl("start"); - auto startToken = params.value(start); - if (startToken.isEmpty()) { - start = qsl("startgroup"); - startToken = params.value(start); - if (startToken.isEmpty()) { - start = QString(); - } - } - auto post = (start == qsl("startgroup")) ? ShowAtProfileMsgId : ShowAtUnreadMsgId; - auto postParam = params.value(qsl("post")); - if (auto postId = postParam.toInt()) { - post = postId; - } - auto gameParam = params.value(qsl("game")); - if (!gameParam.isEmpty() && regex_match(qsl("^[a-zA-Z0-9\\.\\_]+$"), gameParam, matchOptions)) { - startToken = gameParam; - post = ShowAtGameShareMsgId; - } - const auto clickFromMessageId = context.value(); - main->openPeerByName( - domain, - post, - startToken, - clickFromMessageId); - return true; - } - } - } else if (auto shareGameScoreMatch = regex_match(qsl("^share_game_score/?\\?(.+)(#|$)"), command, matchOptions)) { - if (auto main = App::main()) { - auto params = url_parse_params(shareGameScoreMatch->captured(1), UrlParamNameTransform::ToLower); - ShareGameScoreByHash(params.value(qsl("hash"))); - return true; - } - } else if (auto socksMatch = regex_match(qsl("^socks/?\\?(.+)(#|$)"), command, matchOptions)) { - auto params = url_parse_params(socksMatch->captured(1), UrlParamNameTransform::ToLower); - ProxiesBoxController::ShowApplyConfirmation(ProxyData::Type::Socks5, params); - return true; - } else if (auto proxyMatch = regex_match(qsl("^proxy/?\\?(.+)(#|$)"), command, matchOptions)) { - auto params = url_parse_params(proxyMatch->captured(1), UrlParamNameTransform::ToLower); - ProxiesBoxController::ShowApplyConfirmation(ProxyData::Type::Mtproto, params); - return true; - } else if (auto authMatch = regex_match(qsl("^passport/?\\?(.+)(#|$)"), command, matchOptions)) { - return showPassportForm(url_parse_params( - authMatch->captured(1), - UrlParamNameTransform::ToLower)); - } else if (auto unknownMatch = regex_match(qsl("^([^\\?]+)(\\?|#|$)"), command, matchOptions)) { - if (_authSession) { - const auto request = unknownMatch->captured(1); - const auto callback = [=](const MTPDhelp_deepLinkInfo &result) { - const auto text = TextWithEntities{ - qs(result.vmessage), - (result.has_entities() - ? TextUtilities::EntitiesFromMTP(result.ventities.v) - : EntitiesInText()) - }; - if (result.is_update_app()) { - const auto box = std::make_shared>(); - const auto callback = [=] { - Core::UpdateApplication(); - if (*box) (*box)->closeBox(); - }; - *box = Ui::show(Box( - text, - lang(lng_menu_update), - callback)); - } else { - Ui::show(Box(text)); - } - }; - _authSession->api().requestDeepLinkInfo(request, callback); + const auto options = RegExOption::CaseInsensitive; + for (const auto &[expression, handler] : Core::LocalUrlHandlers()) { + const auto match = regex_match(expression, command, options); + if (match) { + return handler(match, context); } } return false; diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index 2e56e5a1c..aa7ccff84 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -25,6 +25,7 @@ class Databases; namespace Core { class Launcher; +class LocalUrlHandler; } // namespace Core namespace Window { @@ -231,6 +232,8 @@ private: void clearPasscodeLock(); void loggedOut(); + void fillLocalUrlHandlers(); + not_null _launcher; QMap killDownloadSessionTimes; diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp index a5fb1e0ce..72f05527a 100644 --- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp +++ b/Telegram/SourceFiles/profile/profile_block_group_members.cpp @@ -96,8 +96,9 @@ void GroupMembersWidget::restrictUser(not_null user) { auto box = Box(megagroup, user, hasAdminRights, currentRights); box->setSaveCallback([megagroup, user](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) { Ui::hideLayer(); + // #TODO use Auth().api(). MTP::send(MTPchannels_EditBanned(megagroup->inputChannel, user->inputUser, newRights), rpcDone([megagroup, user, oldRights, newRights](const MTPUpdates &result) { - if (App::main()) App::main()->sentUpdatesReceived(result); + Auth().api().applyUpdates(result); megagroup->applyEditBanned(user, oldRights, newRights); })); }); diff --git a/Telegram/SourceFiles/ui/abstract_button.cpp b/Telegram/SourceFiles/ui/abstract_button.cpp index 5bac36b37..f51158492 100644 --- a/Telegram/SourceFiles/ui/abstract_button.cpp +++ b/Telegram/SourceFiles/ui/abstract_button.cpp @@ -72,8 +72,8 @@ void AbstractButton::mouseReleaseEvent(QMouseEvent *e) { if (was & StateFlag::Over) { _modifiers = e->modifiers(); auto weak = make_weak(this); - if (_clickedCallback) { - _clickedCallback(); + if (const auto callback = _clickedCallback) { + callback(); } else { emit clicked(); } diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 6b7bdd279..3f8fe05b7 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -117,6 +117,8 @@ <(src_loc)/core/file_utilities.h <(src_loc)/core/launcher.cpp <(src_loc)/core/launcher.h +<(src_loc)/core/local_url_handlers.cpp +<(src_loc)/core/local_url_handlers.h <(src_loc)/core/main_queue_processor.cpp <(src_loc)/core/main_queue_processor.h <(src_loc)/core/media_active_cache.h