tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve td_api::getMainWebApp.

Browse Source
This commit is contained in:
levlam 2024-07-21 13:16:02 +03:00
parent 6d9864a1cf
commit 106afa050c
6 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
td/generate/scheme/td_api.tl
View File

@ -2197,6 +2197,9 @@ foundWebApp web_app:webApp request_write_access:Bool skip_confirmation:Bool = Fo
//@description Contains information about a Web App @launch_id Unique identifier for the Web App launch @url A Web App URL to open in a web view
webAppInfo launch_id:int64 url:string = WebAppInfo;
//@description Contains information about the main Web App of a bot @url URL of the Web App to open @is_compact True, if the Web App must be always opened in the compact mode instead of the full-size mode
mainWebApp url:string is_compact:Bool = MainWebApp;
//@description Contains information about a message thread
//@chat_id Identifier of the chat to which the message thread belongs
@ -6507,7 +6510,7 @@ internalLinkTypeLanguageSettings = InternalLinkType;
//-Then use getMainWebAppUrl with the given URL and open the returned URL as a Web App
//@bot_username Username of the bot
//@url URL to be passed to getMainWebAppUrl
//@is_compact True, if the Web App must be opened in a compact mode instead of a full-size mode
//@is_compact True, if the Web App must be opened in the compact mode instead of the full-size mode
internalLinkTypeMainWebApp bot_username:string url:string is_compact:Bool = InternalLinkType;
//@description The link is a link to a Telegram message or a forum topic. Call getMessageLinkInfo with the given URL to process the link,
@ -6622,7 +6625,7 @@ internalLinkTypeVideoChat chat_username:string invite_hash:string is_live_stream
//@bot_username Username of the bot that owns the Web App
//@web_app_short_name Short name of the Web App
//@start_parameter Start parameter to be passed to getWebAppLinkUrl
//@is_compact True, if the Web App must be opened in a compact mode instead of a full-size mode
//@is_compact True, if the Web App must be opened in the compact mode instead of the full-size mode
internalLinkTypeWebApp bot_username:string web_app_short_name:string start_parameter:string is_compact:Bool = InternalLinkType;
@ -9138,23 +9141,23 @@ searchWebApp bot_user_id:int53 web_app_short_name:string = FoundWebApp;
//@web_app_short_name Short name of the Web App
//@start_parameter Start parameter from internalLinkTypeWebApp
//@theme Preferred Web App theme; pass null to use the default theme
//@application_name Short name of the application; 0-64 English letters, digits, and underscores
//@application_name Short name of the current application; 0-64 English letters, digits, and underscores
//@allow_write_access Pass true if the current user allowed the bot to send them messages
getWebAppLinkUrl chat_id:int53 bot_user_id:int53 web_app_short_name:string start_parameter:string theme:themeParameters application_name:string allow_write_access:Bool = HttpUrl;
//@description Returns an HTTPS URL to open the main Web App of a bot
//@description Returns information needed to open the main Web App of a bot
//@chat_id Identifier of the chat in which the Web App is opened; pass 0 if none
//@bot_user_id Identifier of the target bot
//@start_parameter Start parameter from internalLinkTypeMainWebApp
//@theme Preferred Web App theme; pass null to use the default theme
//@application_name Short name of the application; 0-64 English letters, digits, and underscores
getMainWebAppUrl chat_id:int53 bot_user_id:int53 start_parameter:string theme:themeParameters application_name:string = HttpUrl;
//@application_name Short name of the current application; 0-64 English letters, digits, and underscores
getMainWebApp chat_id:int53 bot_user_id:int53 start_parameter:string theme:themeParameters application_name:string = MainWebApp;
//@description Returns an HTTPS URL of a Web App to open from the side menu, a keyboardButtonTypeWebApp button, an inlineQueryResultsButtonTypeWebApp button, or an internalLinkTypeSideMenuBot link
//@bot_user_id Identifier of the target bot
//@url The URL from a keyboardButtonTypeWebApp button, inlineQueryResultsButtonTypeWebApp button, an internalLinkTypeSideMenuBot link, or an empty when the bot is opened from the side menu
//@theme Preferred Web App theme; pass null to use the default theme
//@application_name Short name of the application; 0-64 English letters, digits, and underscores
//@application_name Short name of the current application; 0-64 English letters, digits, and underscores
getWebAppUrl bot_user_id:int53 url:string theme:themeParameters application_name:string = HttpUrl;
//@description Sends data received from a keyboardButtonTypeWebApp Web App to a bot
@ -9169,7 +9172,7 @@ sendWebAppData bot_user_id:int53 button_text:string data:string = Ok;
//@bot_user_id Identifier of the bot, providing the Web App
//@url The URL from an inlineKeyboardButtonTypeWebApp button, a botMenuButton button, an internalLinkTypeAttachmentMenuBot link, or an empty string otherwise
//@theme Preferred Web App theme; pass null to use the default theme
//@application_name Short name of the application; 0-64 English letters, digits, and underscores
//@application_name Short name of the current application; 0-64 English letters, digits, and underscores
//@message_thread_id If not 0, the message thread identifier in which the message will be sent
//@reply_to Information about the message or story to be replied in the message sent by the Web App; pass null if none
openWebApp chat_id:int53 bot_user_id:int53 url:string theme:themeParameters application_name:string message_thread_id:int53 reply_to:InputMessageReplyTo = WebAppInfo;

10
td/telegram/AttachMenuManager.cpp
View File

@ -158,10 +158,11 @@ class RequestAppWebViewQuery final : public Td::ResultHandler {
};
class RequestMainWebViewQuery final : public Td::ResultHandler {
Promise<string> promise_;
Promise<td_api::object_ptr<td_api::mainWebApp>> promise_;
public:
explicit RequestMainWebViewQuery(Promise<string> &&promise) : promise_(std::move(promise)) {
explicit RequestMainWebViewQuery(Promise<td_api::object_ptr<td_api::mainWebApp>> &&promise)
: promise_(std::move(promise)) {
}
void send(DialogId dialog_id, telegram_api::object_ptr<telegram_api::InputUser> &&input_user,
@ -194,7 +195,7 @@ class RequestMainWebViewQuery final : public Td::ResultHandler {
auto ptr = result_ptr.move_as_ok();
LOG(INFO) << "Receive result for RequestMainWebViewQuery: " << to_string(ptr);
LOG_IF(ERROR, ptr->query_id_ != 0) << "Receive " << to_string(ptr);
promise_.set_value(std::move(ptr->url_));
promise_.set_value(td_api::make_object<td_api::mainWebApp>(ptr->url_, !ptr->fullsize_));
}
void on_error(Status status) final {
@ -932,7 +933,8 @@ void AttachMenuManager::request_app_web_view(DialogId dialog_id, UserId bot_user
void AttachMenuManager::request_main_web_view(DialogId dialog_id, UserId bot_user_id, string &&start_parameter,
const td_api::object_ptr<td_api::themeParameters> &theme,
string &&platform, Promise<string> &&promise) {
string &&platform,
Promise<td_api::object_ptr<td_api::mainWebApp>> &&promise) {
if (!td_->dialog_manager_->have_input_peer(dialog_id, false, AccessRights::Read)) {
dialog_id = DialogId(bot_user_id);
}

2
td/telegram/AttachMenuManager.h
View File

@ -47,7 +47,7 @@ class AttachMenuManager final : public Actor {
void request_main_web_view(DialogId dialog_id, UserId bot_user_id, string &&start_parameter,
const td_api::object_ptr<td_api::themeParameters> &theme, string &&platform,
Promise<string> &&promise);
Promise<td_api::object_ptr<td_api::mainWebApp>> &&promise);
void request_web_view(DialogId dialog_id, UserId bot_user_id, MessageId top_thread_message_id,
td_api::object_ptr<td_api::InputMessageReplyTo> &&reply_to, string &&url,

11
td/telegram/Td.cpp
View File

@ -9064,21 +9064,14 @@ void Td::on_request(uint64 id, td_api::getWebAppLinkUrl &request) {
request.allow_write_access_, std::move(query_promise));
}
void Td::on_request(uint64 id, td_api::getMainWebAppUrl &request) {
void Td::on_request(uint64 id, td_api::getMainWebApp &request) {
CHECK_IS_USER();
CLEAN_INPUT_STRING(request.start_parameter_);
CLEAN_INPUT_STRING(request.application_name_);
CREATE_REQUEST_PROMISE();
auto query_promise = PromiseCreator::lambda([promise = std::move(promise)](Result<string> result) mutable {
if (result.is_error()) {
promise.set_error(result.move_as_error());
} else {
promise.set_value(td_api::make_object<td_api::httpUrl>(result.move_as_ok()));
}
});
attach_menu_manager_->request_main_web_view(DialogId(request.chat_id_), UserId(request.bot_user_id_),
std::move(request.start_parameter_), std::move(request.theme_),
std::move(request.application_name_), std::move(query_promise));
std::move(request.application_name_), std::move(promise));
}
void Td::on_request(uint64 id, td_api::getWebAppUrl &request) {

2
td/telegram/Td.h
View File

@ -1777,7 +1777,7 @@ class Td final : public Actor {
void on_request(uint64 id, td_api::getWebAppLinkUrl &request);
void on_request(uint64 id, td_api::getMainWebAppUrl &request);
void on_request(uint64 id, td_api::getMainWebApp &request);
void on_request(uint64 id, td_api::getWebAppUrl &request);

6
td/telegram/cli.cpp
View File

@ -4869,13 +4869,13 @@ class CliClient final : public Actor {
get_args(args, chat_id, bot_user_id, short_name, start_parameter);
send_request(td_api::make_object<td_api::getWebAppLinkUrl>(chat_id, bot_user_id, short_name, start_parameter,
as_theme_parameters(), "android", true));
} else if (op == "gmwau") {
} else if (op == "gmwa") {
ChatId chat_id;
UserId bot_user_id;
string start_parameter;
get_args(args, chat_id, bot_user_id, start_parameter);
send_request(td_api::make_object<td_api::getMainWebAppUrl>(chat_id, bot_user_id, start_parameter,
as_theme_parameters(), "android"));
send_request(td_api::make_object<td_api::getMainWebApp>(chat_id, bot_user_id, start_parameter,
as_theme_parameters(), "android"));
} else if (op == "gwau") {
UserId bot_user_id;
string url;