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

Add userTypeBot.can_be_added_to_attach_menu flag.

Browse Source
This commit is contained in:
levlam 2022-03-25 13:02:01 +03:00
parent 214e9cf3f2
commit 234c7423bf
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,10 +366,14 @@ userTypeRegular = UserType;
//@description A deleted user or deleted bot. No information on the user besides the user identifier is available. It is not possible to perform any active actions on this type of user
userTypeDeleted = UserType;
//@description A bot (see https://core.telegram.org/bots) @can_join_groups True, if the bot can be invited to basic group and supergroup chats
//@description A bot (see https://core.telegram.org/bots)
//@can_join_groups True, if the bot can be invited to basic group and supergroup chats
//@can_read_all_group_messages True, if the bot can read all messages in basic group or supergroup chats and not just those addressed to the bot. In private and channel chats a bot can always read all messages
//@is_inline True, if the bot supports inline queries @inline_query_placeholder Placeholder for inline queries (displayed on the application input field) @need_location True, if the location of the user is expected to be sent with every inline query to this bot
userTypeBot can_join_groups:Bool can_read_all_group_messages:Bool is_inline:Bool inline_query_placeholder:string need_location:Bool = UserType;
//@is_inline True, if the bot supports inline queries
//@inline_query_placeholder Placeholder for inline queries (displayed on the application input field)
//@need_location True, if the location of the user is expected to be sent with every inline query to this bot
//@can_be_added_to_attach_menu True, if the bot can be added to attach menu
userTypeBot can_join_groups:Bool can_read_all_group_messages:Bool is_inline:Bool inline_query_placeholder:string need_location:Bool can_be_added_to_attach_menu:Bool = UserType;
//@description No information on the user besides the user identifier is available, yet this user has not been deleted. This object is extremely rare and must be handled like a deleted user. It is not possible to perform any actions on users of this type
userTypeUnknown = UserType;

31
td/telegram/ContactsManager.cpp
View File

@ -3534,6 +3534,7 @@ void ContactsManager::User::store(StorerT &storer) const {
STORE_FLAG(has_restriction_reasons);
STORE_FLAG(need_apply_min_photo);
STORE_FLAG(is_fake);
STORE_FLAG(can_be_added_to_attach_menu);
END_STORE_FLAGS();
store(first_name, storer);
if (has_last_name) {
@ -3604,6 +3605,7 @@ void ContactsManager::User::parse(ParserT &parser) {
PARSE_FLAG(has_restriction_reasons);
PARSE_FLAG(need_apply_min_photo);
PARSE_FLAG(is_fake);
PARSE_FLAG(can_be_added_to_attach_menu);
END_PARSE_FLAGS();
parse(first_name, parser);
if (has_last_name) {
@ -8471,6 +8473,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
bool is_deleted = (flags & USER_FLAG_IS_DELETED) != 0;
bool can_join_groups = (flags & USER_FLAG_IS_PRIVATE_BOT) == 0;
bool can_read_all_group_messages = (flags & USER_FLAG_IS_BOT_WITH_PRIVACY_DISABLED) != 0;
bool can_be_added_to_attach_menu = (flags & USER_FLAG_IS_ATTACH_MENU_BOT) != 0;
auto restriction_reasons = get_restriction_reasons(std::move(user->restriction_reason_));
bool is_scam = (flags & USER_FLAG_IS_SCAM) != 0;
bool is_inline_bot = (flags & USER_FLAG_IS_INLINE_BOT) != 0;
@ -8485,6 +8488,8 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
<< "Receive not bot " << user_id << " which can't join groups from " << source;
LOG_IF(ERROR, can_read_all_group_messages && !is_bot)
<< "Receive not bot " << user_id << " which can read all group messages from " << source;
LOG_IF(ERROR, can_be_added_to_attach_menu && !is_bot)
<< "Receive not bot " << user_id << " which can be added to attach menu from " << source;
LOG_IF(ERROR, is_inline_bot && !is_bot) << "Receive not bot " << user_id << " which is inline bot from " << source;
LOG_IF(ERROR, need_location_bot && !is_inline_bot)
<< "Receive not inline bot " << user_id << " which needs user location from " << source;
@ -8496,6 +8501,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
is_bot = false;
can_join_groups = false;
can_read_all_group_messages = false;
can_be_added_to_attach_menu = false;
is_inline_bot = false;
inline_query_placeholder = string();
need_location_bot = false;
@ -8511,7 +8517,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
can_join_groups != u->can_join_groups || can_read_all_group_messages != u->can_read_all_group_messages ||
restriction_reasons != u->restriction_reasons || is_scam != u->is_scam || is_fake != u->is_fake ||
is_inline_bot != u->is_inline_bot || inline_query_placeholder != u->inline_query_placeholder ||
need_location_bot != u->need_location_bot) {
need_location_bot != u->need_location_bot || can_be_added_to_attach_menu != u->can_be_added_to_attach_menu) {
LOG_IF(ERROR, is_bot != u->is_bot && !is_deleted && !u->is_deleted && u->is_received)
<< "User.is_bot has changed for " << user_id << "/" << u->username << " from " << source << " from "
<< u->is_bot << " to " << is_bot;
@ -8526,6 +8532,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
u->is_inline_bot = is_inline_bot;
u->inline_query_placeholder = std::move(inline_query_placeholder);
u->need_location_bot = need_location_bot;
u->can_be_added_to_attach_menu = can_be_added_to_attach_menu;
LOG(DEBUG) << "Info has changed for " << user_id;
u->is_changed = true;
@ -14024,23 +14031,24 @@ Result<ContactsManager::BotData> ContactsManager::get_bot_data(UserId user_id) c
return Status::Error(400, "Bot not found");
}
auto bot = p->second.get();
if (!bot->is_bot) {
auto u = p->second.get();
if (!u->is_bot) {
return Status::Error(400, "User is not a bot");
}
if (bot->is_deleted) {
if (u->is_deleted) {
return Status::Error(400, "Bot is deleted");
}
if (!bot->is_received) {
if (!u->is_received) {
return Status::Error(400, "Bot is inaccessible");
}
BotData bot_data;
bot_data.username = bot->username;
bot_data.can_join_groups = bot->can_join_groups;
bot_data.can_read_all_group_messages = bot->can_read_all_group_messages;
bot_data.is_inline = bot->is_inline_bot;
bot_data.need_location = bot->need_location_bot;
bot_data.username = u->username;
bot_data.can_join_groups = u->can_join_groups;
bot_data.can_read_all_group_messages = u->can_read_all_group_messages;
bot_data.is_inline = u->is_inline_bot;
bot_data.need_location = u->need_location_bot;
bot_data.can_be_added_to_attach_menu = u->can_be_added_to_attach_menu;
return bot_data;
}
@ -16218,7 +16226,8 @@ tl_object_ptr<td_api::user> ContactsManager::get_user_object(UserId user_id, con
type = make_tl_object<td_api::userTypeDeleted>();
} else if (u->is_bot) {
type = make_tl_object<td_api::userTypeBot>(u->can_join_groups, u->can_read_all_group_messages, u->is_inline_bot,
u->inline_query_placeholder, u->need_location_bot);
u->inline_query_placeholder, u->need_location_bot,
u->can_be_added_to_attach_menu);
} else {
type = make_tl_object<td_api::userTypeRegular>();
}

3
td/telegram/ContactsManager.h
View File

@ -455,6 +455,7 @@ class ContactsManager final : public Actor {
bool can_read_all_group_messages;
bool is_inline;
bool need_location;
bool can_be_added_to_attach_menu;
};
Result<BotData> get_bot_data(UserId user_id) const TD_WARN_UNUSED_RESULT;
@ -654,6 +655,7 @@ class ContactsManager final : public Actor {
bool is_contact = false;
bool is_mutual_contact = false;
bool need_apply_min_photo = false;
bool can_be_added_to_attach_menu = false;
bool is_photo_inited = false;
@ -1031,6 +1033,7 @@ class ContactsManager final : public Actor {
static constexpr int32 USER_FLAG_IS_SCAM = 1 << 24;
static constexpr int32 USER_FLAG_NEED_APPLY_MIN_PHOTO = 1 << 25;
static constexpr int32 USER_FLAG_IS_FAKE = 1 << 26;
static constexpr int32 USER_FLAG_IS_ATTACH_MENU_BOT = 1 << 27;
static constexpr int32 USER_FULL_FLAG_IS_BLOCKED = 1 << 0;
static constexpr int32 USER_FULL_FLAG_HAS_ABOUT = 1 << 1;