PaiGramTeam/telegram-bot-api
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/telegram-bot-api.git synced 2024-11-27 02:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add use_independent_chat_permissions to restrictChatMember and setChatPermissions.

Browse Source
This commit is contained in:
levlam 2023-02-01 04:00:16 +03:00
parent 0bc181c216
commit 0e6826b7e4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
telegram-bot-api/Client.cpp
View File

@ -6929,8 +6929,8 @@ td::Result<td_api::object_ptr<td_api::location>> Client::get_location(const Quer
td::to_double(horizontal_accuracy)); td::to_double(horizontal_accuracy));
} }
td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permissions(const Query *query, td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permissions(
bool &allow_legacy) { const Query *query, bool &allow_legacy, bool use_independent_chat_permissions) {
auto can_send_messages = false; auto can_send_messages = false;
auto can_send_audios = false; auto can_send_audios = false;
auto can_send_documents = false; auto can_send_documents = false;
@ -6992,7 +6992,7 @@ td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permiss
can_send_videos = can_send_media_messages; can_send_videos = can_send_media_messages;
can_send_video_notes = can_send_media_messages; can_send_video_notes = can_send_media_messages;
can_send_voice_notes = can_send_media_messages; can_send_voice_notes = can_send_media_messages;
if (can_send_media_messages) { if (can_send_media_messages && !use_independent_chat_permissions) {
can_send_messages = true; can_send_messages = true;
} }
} }
@ -7003,7 +7003,7 @@ td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permiss
return Status::Error(400, PSLICE() << "Can't parse chat permissions: " << status.message()); return Status::Error(400, PSLICE() << "Can't parse chat permissions: " << status.message());
} }
if (can_send_other_messages || can_add_web_page_previews) { if ((can_send_other_messages || can_add_web_page_previews) && !use_independent_chat_permissions) {
can_send_audios = true; can_send_audios = true;
can_send_documents = true; can_send_documents = true;
can_send_photos = true; can_send_photos = true;
@ -7012,7 +7012,7 @@ td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permiss
can_send_voice_notes = true; can_send_voice_notes = true;
can_send_messages = true; can_send_messages = true;
} }
if (can_send_polls) { if (can_send_polls && !use_independent_chat_permissions) {
can_send_messages = true; can_send_messages = true;
} }
} else if (allow_legacy) { } else if (allow_legacy) {
@ -7022,10 +7022,10 @@ td::Result<td_api::object_ptr<td_api::chatPermissions>> Client::get_chat_permiss
bool can_send_media_messages = to_bool(query->arg("can_send_media_messages")); bool can_send_media_messages = to_bool(query->arg("can_send_media_messages"));
can_send_other_messages = to_bool(query->arg("can_send_other_messages")); can_send_other_messages = to_bool(query->arg("can_send_other_messages"));
can_add_web_page_previews = to_bool(query->arg("can_add_web_page_previews")); can_add_web_page_previews = to_bool(query->arg("can_add_web_page_previews"));
if (can_send_other_messages || can_add_web_page_previews) { if ((can_send_other_messages || can_add_web_page_previews) && !use_independent_chat_permissions) {
can_send_media_messages = true; can_send_media_messages = true;
} }
if (can_send_media_messages) { if (can_send_media_messages && !use_independent_chat_permissions) {
can_send_messages = true; can_send_messages = true;
} }
@ -8395,7 +8395,8 @@ td::Status Client::process_set_chat_title_query(PromisedQueryPtr &query) {
td::Status Client::process_set_chat_permissions_query(PromisedQueryPtr &query) { td::Status Client::process_set_chat_permissions_query(PromisedQueryPtr &query) {
auto chat_id = query->arg("chat_id"); auto chat_id = query->arg("chat_id");
bool allow_legacy = false; bool allow_legacy = false;
TRY_RESULT(permissions, get_chat_permissions(query.get(), allow_legacy)); auto use_independent_chat_permissions = to_bool(query->arg("use_independent_chat_permissions"));
TRY_RESULT(permissions, get_chat_permissions(query.get(), allow_legacy, use_independent_chat_permissions));
CHECK(!allow_legacy); CHECK(!allow_legacy);
check_chat(chat_id, AccessRights::Write, std::move(query), check_chat(chat_id, AccessRights::Write, std::move(query),
@ -8818,7 +8819,8 @@ td::Status Client::process_restrict_chat_member_query(PromisedQueryPtr &query) {
TRY_RESULT(user_id, get_user_id(query.get())); TRY_RESULT(user_id, get_user_id(query.get()));
int32 until_date = get_integer_arg(query.get(), "until_date", 0); int32 until_date = get_integer_arg(query.get(), "until_date", 0);
bool allow_legacy = true; bool allow_legacy = true;
TRY_RESULT(permissions, get_chat_permissions(query.get(), allow_legacy)); auto use_independent_chat_permissions = to_bool(query->arg("use_independent_chat_permissions"));
TRY_RESULT(permissions, get_chat_permissions(query.get(), allow_legacy, use_independent_chat_permissions));
check_chat(chat_id, AccessRights::Write, std::move(query), check_chat(chat_id, AccessRights::Write, std::move(query),
[this, user_id, until_date, is_legacy = allow_legacy, permissions = std::move(permissions)]( [this, user_id, until_date, is_legacy = allow_legacy, permissions = std::move(permissions)](

3
telegram-bot-api/Client.h
View File

@ -433,7 +433,8 @@ class Client final : public WebhookActor::Callback {
static td::Result<object_ptr<td_api::location>> get_location(const Query *query); static td::Result<object_ptr<td_api::location>> get_location(const Query *query);
static td::Result<object_ptr<td_api::chatPermissions>> get_chat_permissions(const Query *query, bool &allow_legacy); static td::Result<object_ptr<td_api::chatPermissions>> get_chat_permissions(const Query *query, bool &allow_legacy,
bool use_independent_chat_permissions);
td::Result<object_ptr<td_api::InputMessageContent>> get_input_media(const Query *query, td::JsonValue &&input_media, td::Result<object_ptr<td_api::InputMessageContent>> get_input_media(const Query *query, td::JsonValue &&input_media,
bool for_album) const; bool for_album) const;