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

Support side menu icons for bots.

Browse Source
This commit is contained in:
levlam 2023-09-08 17:21:16 +03:00
parent 793e2ed0be
commit d2a3dfccc3
3 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3631,11 +3631,14 @@ attachmentMenuBotColor light_color:int32 dark_color:int32 = AttachmentMenuBotCol
//@default_icon Default icon for the bot in SVG format; may be null
//@ios_static_icon Icon for the bot in SVG format for the official iOS app; may be null
//@ios_animated_icon Icon for the bot in TGS format for the official iOS app; may be null
//@ios_side_menu_icon Icon for the bot in PNG format for the official iOS app side menu; may be null
//@android_icon Icon for the bot in TGS format for the official Android app; may be null
//@android_side_menu_icon Icon for the bot in SVG format for the official Android app side menu; may be null
//@macos_icon Icon for the bot in TGS format for the official native macOS app; may be null
//@macos_side_menu_icon Icon for the bot in PNG format for the official macOS app side menu; may be null
//@icon_color Color to highlight selected icon of the bot if appropriate; may be null
//@web_app_placeholder Default placeholder for opened Web Apps in SVG format; may be null
attachmentMenuBot bot_user_id:int53 supports_self_chat:Bool supports_user_chats:Bool supports_bot_chats:Bool supports_group_chats:Bool supports_channel_chats:Bool supports_settings:Bool request_write_access:Bool is_added:Bool show_in_attachment_menu:Bool show_in_side_menu:Bool show_disclaimer_in_side_menu:Bool name:string name_color:attachmentMenuBotColor default_icon:file ios_static_icon:file ios_animated_icon:file android_icon:file macos_icon:file icon_color:attachmentMenuBotColor web_app_placeholder:file = AttachmentMenuBot;
attachmentMenuBot bot_user_id:int53 supports_self_chat:Bool supports_user_chats:Bool supports_bot_chats:Bool supports_group_chats:Bool supports_channel_chats:Bool supports_settings:Bool request_write_access:Bool is_added:Bool show_in_attachment_menu:Bool show_in_side_menu:Bool show_disclaimer_in_side_menu:Bool name:string name_color:attachmentMenuBotColor default_icon:file ios_static_icon:file ios_animated_icon:file ios_side_menu_icon:file android_icon:file android_side_menu_icon:file macos_icon:file macos_side_menu_icon:file icon_color:attachmentMenuBotColor web_app_placeholder:file = AttachmentMenuBot;
//@description Information about the message sent by answerWebAppQuery @inline_message_id Identifier of the sent inline message, if known
sentWebAppMessage inline_message_id:string = SentWebAppMessage;

63
td/telegram/AttachMenuManager.cpp
View File

@ -421,7 +421,10 @@ bool operator==(const AttachMenuManager::AttachMenuBot &lhs, const AttachMenuMan
lhs.ios_static_icon_file_id_ == rhs.ios_static_icon_file_id_ &&
lhs.ios_animated_icon_file_id_ == rhs.ios_animated_icon_file_id_ &&
lhs.android_icon_file_id_ == rhs.android_icon_file_id_ && lhs.macos_icon_file_id_ == rhs.macos_icon_file_id_ &&
lhs.is_added_ == rhs.is_added_ && lhs.name_color_ == rhs.name_color_ && lhs.icon_color_ == rhs.icon_color_ &&
lhs.android_side_menu_icon_file_id_ == rhs.android_side_menu_icon_file_id_ &&
lhs.ios_side_menu_icon_file_id_ == rhs.ios_side_menu_icon_file_id_ &&
lhs.macos_side_menu_icon_file_id_ == rhs.macos_side_menu_icon_file_id_ && lhs.is_added_ == rhs.is_added_ &&
lhs.name_color_ == rhs.name_color_ && lhs.icon_color_ == rhs.icon_color_ &&
lhs.placeholder_file_id_ == rhs.placeholder_file_id_;
}
@ -440,6 +443,9 @@ void AttachMenuManager::AttachMenuBot::store(StorerT &storer) const {
bool has_support_flags = true;
bool has_placeholder_file_id = placeholder_file_id_.is_valid();
bool has_cache_version = cache_version_ != 0;
bool has_android_side_menu_icon_file_id = android_side_menu_icon_file_id_.is_valid();
bool has_ios_side_menu_icon_file_id = ios_side_menu_icon_file_id_.is_valid();
bool has_macos_side_menu_icon_file_id = macos_side_menu_icon_file_id_.is_valid();
BEGIN_STORE_FLAGS();
STORE_FLAG(has_ios_static_icon_file_id);
STORE_FLAG(has_ios_animated_icon_file_id);
@ -461,6 +467,9 @@ void AttachMenuManager::AttachMenuBot::store(StorerT &storer) const {
STORE_FLAG(show_in_attach_menu_);
STORE_FLAG(show_in_side_menu_);
STORE_FLAG(side_menu_disclaimer_needed_);
STORE_FLAG(has_android_side_menu_icon_file_id);
STORE_FLAG(has_ios_side_menu_icon_file_id);
STORE_FLAG(has_macos_side_menu_icon_file_id);
END_STORE_FLAGS();
td::store(user_id_, storer);
td::store(name_, storer);
@ -489,6 +498,15 @@ void AttachMenuManager::AttachMenuBot::store(StorerT &storer) const {
if (has_cache_version) {
td::store(cache_version_, storer);
}
if (has_android_side_menu_icon_file_id) {
td::store(android_side_menu_icon_file_id_, storer);
}
if (has_ios_side_menu_icon_file_id) {
td::store(ios_side_menu_icon_file_id_, storer);
}
if (has_macos_side_menu_icon_file_id) {
td::store(macos_side_menu_icon_file_id_, storer);
}
}
template <class ParserT>
@ -502,6 +520,9 @@ void AttachMenuManager::AttachMenuBot::parse(ParserT &parser) {
bool has_support_flags;
bool has_placeholder_file_id;
bool has_cache_version;
bool has_android_side_menu_icon_file_id;
bool has_ios_side_menu_icon_file_id;
bool has_macos_side_menu_icon_file_id;
BEGIN_PARSE_FLAGS();
PARSE_FLAG(has_ios_static_icon_file_id);
PARSE_FLAG(has_ios_animated_icon_file_id);
@ -523,6 +544,9 @@ void AttachMenuManager::AttachMenuBot::parse(ParserT &parser) {
PARSE_FLAG(show_in_attach_menu_);
PARSE_FLAG(show_in_side_menu_);
PARSE_FLAG(side_menu_disclaimer_needed_);
PARSE_FLAG(has_android_side_menu_icon_file_id);
PARSE_FLAG(has_ios_side_menu_icon_file_id);
PARSE_FLAG(has_macos_side_menu_icon_file_id);
END_PARSE_FLAGS();
td::parse(user_id_, parser);
td::parse(name_, parser);
@ -551,6 +575,15 @@ void AttachMenuManager::AttachMenuBot::parse(ParserT &parser) {
if (has_cache_version) {
td::parse(cache_version_, parser);
}
if (has_android_side_menu_icon_file_id) {
td::parse(android_side_menu_icon_file_id_, parser);
}
if (has_ios_side_menu_icon_file_id) {
td::parse(ios_side_menu_icon_file_id_, parser);
}
if (has_macos_side_menu_icon_file_id) {
td::parse(macos_side_menu_icon_file_id_, parser);
}
if (!has_support_flags) {
supports_self_dialog_ = true;
@ -646,6 +679,9 @@ void AttachMenuManager::init() {
register_file_source(attach_menu_bot.android_icon_file_id_);
register_file_source(attach_menu_bot.macos_icon_file_id_);
register_file_source(attach_menu_bot.placeholder_file_id_);
register_file_source(attach_menu_bot.android_side_menu_icon_file_id_);
register_file_source(attach_menu_bot.ios_side_menu_icon_file_id_);
register_file_source(attach_menu_bot.macos_side_menu_icon_file_id_);
}
} else {
LOG(ERROR) << "Ignore invalid attachment menu bots log event";
@ -894,7 +930,8 @@ Result<AttachMenuManager::AttachMenuBot> AttachMenuManager::get_attach_menu_bot(
CHECK(document_id == telegram_api::document::ID);
if (name != "default_static" && name != "ios_static" && name != "ios_animated" && name != "android_animated" &&
name != "macos_animated" && name != "placeholder_static") {
name != "macos_animated" && name != "placeholder_static" && name != "ios_side_menu_static" &&
name != "android_side_menu_static" && name != "macos_side_menu_static") {
LOG(ERROR) << "Have icon for " << user_id << " with name " << name;
continue;
}
@ -918,11 +955,21 @@ Result<AttachMenuManager::AttachMenuBot> AttachMenuManager::get_attach_menu_bot(
attach_menu_bot.ios_animated_icon_file_id_ = parsed_document.file_id;
break;
case 'i':
attach_menu_bot.android_icon_file_id_ = parsed_document.file_id;
expect_colors = true;
if (name[8] == 's') {
attach_menu_bot.android_side_menu_icon_file_id_ = parsed_document.file_id;
} else if (name[8] == '_') {
attach_menu_bot.ios_side_menu_icon_file_id_ = parsed_document.file_id;
} else {
attach_menu_bot.android_icon_file_id_ = parsed_document.file_id;
expect_colors = true;
}
break;
case '_':
attach_menu_bot.macos_icon_file_id_ = parsed_document.file_id;
if (name[6] == 's') {
attach_menu_bot.macos_side_menu_icon_file_id_ = parsed_document.file_id;
} else {
attach_menu_bot.macos_icon_file_id_ = parsed_document.file_id;
}
break;
case 'h':
attach_menu_bot.placeholder_file_id_ = parsed_document.file_id;
@ -1258,8 +1305,10 @@ td_api::object_ptr<td_api::attachmentMenuBot> AttachMenuManager::get_attachment_
bot.show_in_attach_menu_, bot.show_in_side_menu_, bot.side_menu_disclaimer_needed_, bot.name_,
get_attach_menu_bot_color_object(bot.name_color_), get_file(bot.default_icon_file_id_),
get_file(bot.ios_static_icon_file_id_), get_file(bot.ios_animated_icon_file_id_),
get_file(bot.android_icon_file_id_), get_file(bot.macos_icon_file_id_),
get_attach_menu_bot_color_object(bot.icon_color_), get_file(bot.placeholder_file_id_));
get_file(bot.ios_side_menu_icon_file_id_), get_file(bot.android_icon_file_id_),
get_file(bot.android_side_menu_icon_file_id_), get_file(bot.macos_icon_file_id_),
get_file(bot.macos_side_menu_icon_file_id_), get_attach_menu_bot_color_object(bot.icon_color_),
get_file(bot.placeholder_file_id_));
}
td_api::object_ptr<td_api::updateAttachmentMenuBots> AttachMenuManager::get_update_attachment_menu_bots_object() const {

3
td/telegram/AttachMenuManager.h
View File

@ -116,6 +116,9 @@ class AttachMenuManager final : public Actor {
FileId ios_animated_icon_file_id_;
FileId android_icon_file_id_;
FileId macos_icon_file_id_;
FileId android_side_menu_icon_file_id_;
FileId ios_side_menu_icon_file_id_;
FileId macos_side_menu_icon_file_id_;
AttachMenuBotColor icon_color_;
FileId placeholder_file_id_;