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

Allow tg:user URLs in inline keyboard buttons.

Browse Source
This commit is contained in:
levlam 2021-11-24 13:05:56 +03:00
parent 0b2207f180
commit 8f33f96e8c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/ReplyMarkup.cpp
View File

@ -444,6 +444,12 @@ static Result<InlineKeyboardButton> get_inline_keyboard_button(tl_object_ptr<td_
switch (button_type_id) { switch (button_type_id) {
case td_api::inlineKeyboardButtonTypeUrl::ID: { case td_api::inlineKeyboardButtonTypeUrl::ID: {
auto button_type = move_tl_object_as<td_api::inlineKeyboardButtonTypeUrl>(button->type_); auto button_type = move_tl_object_as<td_api::inlineKeyboardButtonTypeUrl>(button->type_);
auto user_id = LinkManager::get_link_user_id(button_type->url_);
if (user_id.is_valid()) {
current_button.type = InlineKeyboardButton::Type::User;
current_button.user_id = user_id;
break;
}
auto r_url = LinkManager::check_link(button_type->url_); auto r_url = LinkManager::check_link(button_type->url_);
if (r_url.is_error()) { if (r_url.is_error()) {
return Status::Error(400, "Inline keyboard button URL is invalid"); return Status::Error(400, "Inline keyboard button URL is invalid");
@ -489,6 +495,10 @@ static Result<InlineKeyboardButton> get_inline_keyboard_button(tl_object_ptr<td_
break; break;
case td_api::inlineKeyboardButtonTypeLoginUrl::ID: { case td_api::inlineKeyboardButtonTypeLoginUrl::ID: {
auto button_type = td_api::move_object_as<td_api::inlineKeyboardButtonTypeLoginUrl>(button->type_); auto button_type = td_api::move_object_as<td_api::inlineKeyboardButtonTypeLoginUrl>(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 login URL buttons");
}
auto r_url = LinkManager::check_link(button_type->url_); auto r_url = LinkManager::check_link(button_type->url_);
if (r_url.is_error()) { if (r_url.is_error()) {
return Status::Error(400, "Inline keyboard button login URL is invalid"); return Status::Error(400, "Inline keyboard button login URL is invalid");