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

Add inlineKeyboardButtonTypeWebViewUrl.

Browse Source
This commit is contained in:
levlam 2022-03-25 00:32:38 +03:00
parent 9d481df04d
commit 214e9cf3f2
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1131,9 +1131,12 @@ keyboardButton text:string type:KeyboardButtonType = KeyboardButton;
//@description A button that opens a specified URL @url HTTP or tg:// URL to open
inlineKeyboardButtonTypeUrl url:string = InlineKeyboardButtonType;
//@description A button that opens a specified URL and automatically authorize the current user if allowed to do so @url An HTTP URL to open @id Unique button identifier @forward_text If non-empty, new text of the button in forwarded messages
//@description A button that opens a specified URL and automatically authorize the current user by calling getLoginUrlInfo @url An HTTP URL to pass to getLoginUrlInfo @id Unique button identifier @forward_text If non-empty, new text of the button in forwarded messages
inlineKeyboardButtonTypeLoginUrl url:string id:int53 forward_text:string = InlineKeyboardButtonType;
//@description A button that opens a specified URL in web view by calling getWebViewUrl @url An HTTP URL to pass to getWebViewUrl
inlineKeyboardButtonTypeWebViewUrl url:string = InlineKeyboardButtonType;
//@description A button that sends a callback query to a bot @data Data to be sent to the bot via a callback query
inlineKeyboardButtonTypeCallback data:bytes = InlineKeyboardButtonType;

33
td/telegram/ReplyMarkup.cpp
View File

@ -94,6 +94,9 @@ static StringBuilder &operator<<(StringBuilder &string_builder, const InlineKeyb
case InlineKeyboardButton::Type::User:
string_builder << "User " << keyboard_button.user_id.get();
break;
case InlineKeyboardButton::Type::WebView:
string_builder << "WebView";
break;
default:
UNREACHABLE();
}
@ -278,6 +281,13 @@ static InlineKeyboardButton get_inline_keyboard_button(
button.user_id = UserId(keyboard_button->user_id_);
break;
}
case telegram_api::keyboardButtonWebView::ID: {
auto keyboard_button = move_tl_object_as<telegram_api::keyboardButtonWebView>(keyboard_button_ptr);
button.type = InlineKeyboardButton::Type::WebView;
button.text = std::move(keyboard_button->text_);
button.data = std::move(keyboard_button->url_);
break;
}
default:
LOG(ERROR) << "Unsupported inline keyboard button: " << to_string(keyboard_button_ptr);
}
@ -528,6 +538,24 @@ static Result<InlineKeyboardButton> get_inline_keyboard_button(tl_object_ptr<td_
}
break;
}
case td_api::inlineKeyboardButtonTypeWebViewUrl::ID: {
auto button_type = move_tl_object_as<td_api::inlineKeyboardButtonTypeWebViewUrl>(button->type_);
auto user_id = LinkManager::get_link_user_id(button_type->url_);
if (user_id.is_valid()) {
return Status::Error(400, "Link to a user can't be used in web view URL buttons");
break;
}
auto r_url = LinkManager::check_link(button_type->url_);
if (r_url.is_error()) {
return Status::Error(400, "Inline keyboard button web view URL is invalid");
}
current_button.type = InlineKeyboardButton::Type::WebView;
current_button.data = r_url.move_as_ok();
if (!clean_input_string(current_button.data)) {
return Status::Error(400, "Inline keyboard button web view URL must be encoded in UTF-8");
}
break;
}
default:
UNREACHABLE();
}
@ -721,6 +749,8 @@ static tl_object_ptr<telegram_api::KeyboardButton> get_inline_keyboard_button(
return make_tl_object<telegram_api::inputKeyboardButtonUserProfile>(keyboard_button.text,
r_input_user.move_as_ok());
}
case InlineKeyboardButton::Type::WebView:
return make_tl_object<telegram_api::keyboardButtonWebView>(keyboard_button.text, keyboard_button.data);
default:
UNREACHABLE();
return nullptr;
@ -839,6 +869,9 @@ static tl_object_ptr<td_api::inlineKeyboardButton> get_inline_keyboard_button_ob
G()->td().get_actor_unsafe()->contacts_manager_->get_user_id_object(keyboard_button.user_id,
"get_inline_keyboard_button_object"));
break;
case InlineKeyboardButton::Type::WebView:
type = make_tl_object<td_api::inlineKeyboardButtonTypeWebViewUrl>(keyboard_button.data);
break;
default:
UNREACHABLE();
return nullptr;

3
td/telegram/ReplyMarkup.h
View File

@ -43,7 +43,8 @@ struct InlineKeyboardButton {
Buy,
UrlAuth,
CallbackWithPassword,
User
User,
WebView
};
Type type;
int64 id = 0; // UrlAuth only, button_id or (2 * request_write_access - 1) * bot_user_id