MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix direct bot app links.

This commit is contained in:
John Preston 2023-09-13 08:24:20 +04:00
parent d363a6ea84
commit 97d93b23dc
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
View File

@ -928,10 +928,6 @@ void AttachWebView::requestAddToMenu(
std::optional<Api::SendAction> action) {
Expects(controller != nullptr || _context != nullptr);
if (!bot->isBot() || !bot->botInfo->supportsAttachMenu) {
showToast(tr::lng_bot_menu_not_supported(tr::now), controller);
return;
}
const auto wasController = (controller != nullptr);
_addToMenuChooseController = base::make_weak(controller);
_addToMenuOpen = open;
@ -941,6 +937,30 @@ void AttachWebView::requestAddToMenu(
_addToMenuContext = std::make_unique<Context>(
LookupContext(controller, *action));
}
const auto unsupported = [=] {
auto context = base::take(_addToMenuContext);
const auto open = base::take(_addToMenuOpen);
if (const auto openApp = std::get_if<AddToMenuOpenApp>(&open)) {
_app = openApp->app;
_startCommand = openApp->startCommand;
_context = std::move(context);
if (_appConfirmationRequired) {
confirmAppOpen(_appRequestWriteAccess);
} else {
requestAppView(false);
}
} else {
showToast(
tr::lng_bot_menu_not_supported(tr::now),
_addToMenuChooseController.get());
}
};
if (!bot->isBot() || !bot->botInfo->supportsAttachMenu) {
unsupported();
return;
}
if (_addToMenuId) {
if (_addToMenuBot == bot) {
return;
@ -1031,20 +1051,7 @@ void AttachWebView::requestAddToMenu(
}).fail([=] {
_addToMenuId = 0;
_addToMenuBot = nullptr;
auto context = base::take(_addToMenuContext);
const auto open = base::take(_addToMenuOpen);
if (const auto openApp = std::get_if<AddToMenuOpenApp>(&open)) {
_app = openApp->app;
_startCommand = openApp->startCommand;
_context = std::move(context);
if (_appConfirmationRequired) {
confirmAppOpen(_appRequestWriteAccess);
} else {
requestAppView(false);
}
} else {
showToast(tr::lng_bot_menu_not_supported(tr::now));
}
unsupported();
}).send();
}