void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support attach bot native back button.

Browse source
This commit is contained in:
John Preston 2022-05-20 20:03:54 +04:00
parent d81bba155a
commit bbaedc1952
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
View file

@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QJsonDocument> #include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject> #include <QtCore/QJsonObject>
#include <QtCore/QJsonArray> #include <QtCore/QJsonArray>
#include <QtGui/QDesktopServices>
namespace Ui::BotWebView { namespace Ui::BotWebView {
namespace { namespace {
@ -326,6 +327,11 @@ Panel::Panel(
return !_hiddenForPayment; return !_hiddenForPayment;
}) | rpl::start_with_next(_close, _widget->lifetime()); }) | rpl::start_with_next(_close, _widget->lifetime());
_widget->backRequests(
) | rpl::start_with_next([=] {
postEvent("back_button_pressed");
}, _widget->lifetime());
rpl::combine( rpl::combine(
style::PaletteChanged(), style::PaletteChanged(),
_themeUpdateForced.events() _themeUpdateForced.events()
@ -570,10 +576,14 @@ bool Panel::createWebview() {
sendDataMessage(list.at(1)); sendDataMessage(list.at(1));
} else if (command == "web_app_setup_main_button") { } else if (command == "web_app_setup_main_button") {
processMainButtonMessage(list.at(1)); processMainButtonMessage(list.at(1));
} else if (command == "web_app_setup_back_button") {
processBackButtonMessage(list.at(1));
} else if (command == "web_app_request_theme") { } else if (command == "web_app_request_theme") {
_themeUpdateForced.fire({}); _themeUpdateForced.fire({});
} else if (command == "web_app_open_tg_link") { } else if (command == "web_app_open_tg_link") {
openTgLink(list.at(1).toString()); openTgLink(list.at(1).toString());
} else if (command == "web_app_open_link") {
openExternalLink(list.at(1).toString());
} else if (command == "web_app_open_invoice") { } else if (command == "web_app_open_invoice") {
openInvoice(list.at(1).toString()); openInvoice(list.at(1).toString());
} }
@ -642,6 +652,24 @@ void Panel::openTgLink(const QJsonValue &value) {
_handleLocalUri("https://t.me" + path); _handleLocalUri("https://t.me" + path);
} }
void Panel::openExternalLink(const QJsonValue &value) {
const auto json = value.toString();
const auto args = ParseMethodArgs(json);
if (args.isEmpty()) {
_close();
return;
}
const auto url = args["url"].toString();
const auto lower = url.toLower();
if (url.isEmpty()
|| (!lower.startsWith("http://") && !lower.startsWith("https://"))) {
LOG(("BotWebView Error: Bad external link \"%1\".").arg(json));
_close();
return;
}
QDesktopServices::openUrl(url);
}
void Panel::openInvoice(const QJsonValue &value) { void Panel::openInvoice(const QJsonValue &value) {
const auto json = value.toString(); const auto json = value.toString();
const auto args = ParseMethodArgs(json); const auto args = ParseMethodArgs(json);
@ -704,6 +732,12 @@ void Panel::processMainButtonMessage(const QJsonValue &value) {
}); });
} }
void Panel::processBackButtonMessage(const QJsonValue &value) {
const auto json = value.toString();
const auto args = ParseMethodArgs(json);
_widget->setBackAllowed(args["is_visible"].toBool());
}
void Panel::createMainButton() { void Panel::createMainButton() {
_mainButton = std::make_unique<Button>( _mainButton = std::make_unique<Button>(
_widget.get(), _widget.get(),

2
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
View file

@ -75,7 +75,9 @@ private:
void setTitle(rpl::producer<QString> title); void setTitle(rpl::producer<QString> title);
void sendDataMessage(const QJsonValue &value); void sendDataMessage(const QJsonValue &value);
void processMainButtonMessage(const QJsonValue &value); void processMainButtonMessage(const QJsonValue &value);
void processBackButtonMessage(const QJsonValue &value);
void openTgLink(const QJsonValue &value); void openTgLink(const QJsonValue &value);
void openExternalLink(const QJsonValue &value);
void openInvoice(const QJsonValue &value); void openInvoice(const QJsonValue &value);
void createMainButton(); void createMainButton();