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

Add replyMarkupShowKeyboard.is_persistent.

Browse Source
This commit is contained in:
levlam 2022-12-15 14:59:12 +03:00
parent c30756f450
commit 214c8d5e70
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1399,11 +1399,12 @@ replyMarkupForceReply is_personal:Bool input_field_placeholder:string = ReplyMar
//@description Contains a custom keyboard layout to quickly reply to bots //@description Contains a custom keyboard layout to quickly reply to bots
//@rows A list of rows of bot keyboard buttons //@rows A list of rows of bot keyboard buttons
//@is_persistent True, if the keyboard should be shown all the time while ordinary keyboard is minimized
//@resize_keyboard True, if the application needs to resize the keyboard vertically //@resize_keyboard True, if the application needs to resize the keyboard vertically
//@one_time True, if the application needs to hide the keyboard after use //@one_time True, if the application needs to hide the keyboard after use
//@is_personal True, if the keyboard must automatically be shown to the current user. For outgoing messages, specify true to show the keyboard only for the mentioned users and for the target user of a reply //@is_personal True, if the keyboard must automatically be shown to the current user. For outgoing messages, specify true to show the keyboard only for the mentioned users and for the target user of a reply
//@input_field_placeholder If non-empty, the placeholder to be shown in the input field when the keyboard is active; 0-64 characters //@input_field_placeholder If non-empty, the placeholder to be shown in the input field when the keyboard is active; 0-64 characters
replyMarkupShowKeyboard rows:vector<vector<keyboardButton>> resize_keyboard:Bool one_time:Bool is_personal:Bool input_field_placeholder:string = ReplyMarkup; replyMarkupShowKeyboard rows:vector<vector<keyboardButton>> is_persistent:Bool resize_keyboard:Bool one_time:Bool is_personal:Bool input_field_placeholder:string = ReplyMarkup;
//@description Contains an inline keyboard layout //@description Contains an inline keyboard layout
//@rows A list of rows of inline keyboard buttons //@rows A list of rows of inline keyboard buttons

15
td/telegram/ReplyMarkup.cpp
View File

@ -27,6 +27,7 @@ static constexpr int32 REPLY_MARKUP_FLAG_NEED_RESIZE_KEYBOARD = 1 << 0;
static constexpr int32 REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD = 1 << 1; static constexpr int32 REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD = 1 << 1;
static constexpr int32 REPLY_MARKUP_FLAG_IS_PERSONAL = 1 << 2; static constexpr int32 REPLY_MARKUP_FLAG_IS_PERSONAL = 1 << 2;
static constexpr int32 REPLY_MARKUP_FLAG_HAS_PLACEHOLDER = 1 << 3; static constexpr int32 REPLY_MARKUP_FLAG_HAS_PLACEHOLDER = 1 << 3;
static constexpr int32 REPLY_MARKUP_FLAG_IS_PERSISTENT = 1 << 4;
static bool operator==(const KeyboardButton &lhs, const KeyboardButton &rhs) { static bool operator==(const KeyboardButton &lhs, const KeyboardButton &rhs) {
return lhs.type == rhs.type && lhs.text == rhs.text; return lhs.type == rhs.type && lhs.text == rhs.text;
@ -122,8 +123,8 @@ bool operator==(const ReplyMarkup &lhs, const ReplyMarkup &rhs) {
if (lhs.type != ReplyMarkup::Type::ShowKeyboard) { if (lhs.type != ReplyMarkup::Type::ShowKeyboard) {
return true; return true;
} }
return lhs.need_resize_keyboard == rhs.need_resize_keyboard && lhs.is_one_time_keyboard == rhs.is_one_time_keyboard && return lhs.is_persistent == rhs.is_persistent && lhs.need_resize_keyboard == rhs.need_resize_keyboard &&
lhs.keyboard == rhs.keyboard; lhs.is_one_time_keyboard == rhs.is_one_time_keyboard && lhs.keyboard == rhs.keyboard;
} }
bool operator!=(const ReplyMarkup &lhs, const ReplyMarkup &rhs) { bool operator!=(const ReplyMarkup &lhs, const ReplyMarkup &rhs) {
@ -156,6 +157,9 @@ StringBuilder &ReplyMarkup::print(StringBuilder &string_builder) const {
} }
if (type == ReplyMarkup::Type::ShowKeyboard) { if (type == ReplyMarkup::Type::ShowKeyboard) {
if (is_persistent) {
string_builder << ", persistent";
}
if (need_resize_keyboard) { if (need_resize_keyboard) {
string_builder << ", need resize"; string_builder << ", need resize";
} }
@ -366,6 +370,7 @@ unique_ptr<ReplyMarkup> get_reply_markup(tl_object_ptr<telegram_api::ReplyMarkup
case telegram_api::replyKeyboardMarkup::ID: { case telegram_api::replyKeyboardMarkup::ID: {
auto keyboard_markup = move_tl_object_as<telegram_api::replyKeyboardMarkup>(reply_markup_ptr); auto keyboard_markup = move_tl_object_as<telegram_api::replyKeyboardMarkup>(reply_markup_ptr);
reply_markup->type = ReplyMarkup::Type::ShowKeyboard; reply_markup->type = ReplyMarkup::Type::ShowKeyboard;
reply_markup->is_persistent = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_IS_PERSISTENT) != 0;
reply_markup->need_resize_keyboard = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_NEED_RESIZE_KEYBOARD) != 0; reply_markup->need_resize_keyboard = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_NEED_RESIZE_KEYBOARD) != 0;
reply_markup->is_one_time_keyboard = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD) != 0; reply_markup->is_one_time_keyboard = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD) != 0;
reply_markup->is_personal = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_IS_PERSONAL) != 0; reply_markup->is_personal = (keyboard_markup->flags_ & REPLY_MARKUP_FLAG_IS_PERSONAL) != 0;
@ -632,6 +637,7 @@ Result<unique_ptr<ReplyMarkup>> get_reply_markup(tl_object_ptr<td_api::ReplyMark
case td_api::replyMarkupShowKeyboard::ID: { case td_api::replyMarkupShowKeyboard::ID: {
auto show_keyboard_markup = move_tl_object_as<td_api::replyMarkupShowKeyboard>(reply_markup_ptr); auto show_keyboard_markup = move_tl_object_as<td_api::replyMarkupShowKeyboard>(reply_markup_ptr);
reply_markup->type = ReplyMarkup::Type::ShowKeyboard; reply_markup->type = ReplyMarkup::Type::ShowKeyboard;
reply_markup->is_persistent = show_keyboard_markup->is_persistent_;
reply_markup->need_resize_keyboard = show_keyboard_markup->resize_keyboard_; reply_markup->need_resize_keyboard = show_keyboard_markup->resize_keyboard_;
reply_markup->is_one_time_keyboard = show_keyboard_markup->one_time_; reply_markup->is_one_time_keyboard = show_keyboard_markup->one_time_;
reply_markup->is_personal = show_keyboard_markup->is_personal_; reply_markup->is_personal = show_keyboard_markup->is_personal_;
@ -840,7 +846,8 @@ tl_object_ptr<telegram_api::ReplyMarkup> ReplyMarkup::get_input_reply_markup(Con
} }
LOG(DEBUG) << "Return replyKeyboardMarkup to send it"; LOG(DEBUG) << "Return replyKeyboardMarkup to send it";
return make_tl_object<telegram_api::replyKeyboardMarkup>( return make_tl_object<telegram_api::replyKeyboardMarkup>(
need_resize_keyboard * REPLY_MARKUP_FLAG_NEED_RESIZE_KEYBOARD + is_persistent * REPLY_MARKUP_FLAG_IS_PERSISTENT +
need_resize_keyboard * REPLY_MARKUP_FLAG_NEED_RESIZE_KEYBOARD +
is_one_time_keyboard * REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD + is_one_time_keyboard * REPLY_MARKUP_FLAG_IS_ONE_TIME_KEYBOARD +
is_personal * REPLY_MARKUP_FLAG_IS_PERSONAL + (!placeholder.empty()) * REPLY_MARKUP_FLAG_HAS_PLACEHOLDER, is_personal * REPLY_MARKUP_FLAG_IS_PERSONAL + (!placeholder.empty()) * REPLY_MARKUP_FLAG_HAS_PLACEHOLDER,
false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, std::move(rows), placeholder); false /*ignored*/, false /*ignored*/, false /*ignored*/, false /*ignored*/, std::move(rows), placeholder);
@ -966,7 +973,7 @@ tl_object_ptr<td_api::ReplyMarkup> ReplyMarkup::get_reply_markup_object(Contacts
rows.push_back(std::move(buttons)); rows.push_back(std::move(buttons));
} }
return make_tl_object<td_api::replyMarkupShowKeyboard>(std::move(rows), need_resize_keyboard, return make_tl_object<td_api::replyMarkupShowKeyboard>(std::move(rows), is_persistent, need_resize_keyboard,
is_one_time_keyboard, is_personal, placeholder); is_one_time_keyboard, is_personal, placeholder);
} }
case ReplyMarkup::Type::RemoveKeyboard: case ReplyMarkup::Type::RemoveKeyboard:

1
td/telegram/ReplyMarkup.h
View File

@ -64,6 +64,7 @@ struct ReplyMarkup {
bool is_personal = false; // for ShowKeyboard, RemoveKeyboard, ForceReply bool is_personal = false; // for ShowKeyboard, RemoveKeyboard, ForceReply
bool is_persistent = false; // for ShowKeyboard
bool need_resize_keyboard = false; // for ShowKeyboard bool need_resize_keyboard = false; // for ShowKeyboard
bool is_one_time_keyboard = false; // for ShowKeyboard bool is_one_time_keyboard = false; // for ShowKeyboard
vector<vector<KeyboardButton>> keyboard; // for ShowKeyboard vector<vector<KeyboardButton>> keyboard; // for ShowKeyboard

2
td/telegram/ReplyMarkup.hpp
View File

@ -126,6 +126,7 @@ void store(const ReplyMarkup &reply_markup, StorerT &storer) {
STORE_FLAG(has_keyboard); STORE_FLAG(has_keyboard);
STORE_FLAG(has_inline_keyboard); STORE_FLAG(has_inline_keyboard);
STORE_FLAG(has_placeholder); STORE_FLAG(has_placeholder);
STORE_FLAG(reply_markup.is_persistent);
END_STORE_FLAGS(); END_STORE_FLAGS();
store(reply_markup.type, storer); store(reply_markup.type, storer);
if (has_keyboard) { if (has_keyboard) {
@ -151,6 +152,7 @@ void parse(ReplyMarkup &reply_markup, ParserT &parser) {
PARSE_FLAG(has_keyboard); PARSE_FLAG(has_keyboard);
PARSE_FLAG(has_inline_keyboard); PARSE_FLAG(has_inline_keyboard);
PARSE_FLAG(has_placeholder); PARSE_FLAG(has_placeholder);
PARSE_FLAG(reply_markup.is_persistent);
END_PARSE_FLAGS(); END_PARSE_FLAGS();
parse(reply_markup.type, parser); parse(reply_markup.type, parser);
if (has_keyboard) { if (has_keyboard) {