MarcoBuster
/
tdlight-telegram-bot-api
mirror of https://github.com/tdlight-team/tdlight-telegram-bot-api.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rebase: Add Client::check_reply_parameters.

This commit is contained in:
David Guillen Fandos 2024-02-03 11:37:40 +01:00
parent 49df33acd7
commit 1084ebd5c8
2 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5840,27 +5840,33 @@ void Client::check_message(td::Slice chat_id_str, int64 message_id, bool allow_e
} }
template <class OnSuccess> template <class OnSuccess>
void Client::check_message_thread(int64 chat_id, int64 message_thread_id, int64 reply_to_message_id, void Client::check_reply_parameters(td::Slice chat_id_str, int64 reply_to_message_id, bool allow_sending_without_reply,
PromisedQueryPtr query, OnSuccess on_success) { int64 message_thread_id, PromisedQueryPtr query, OnSuccess on_success) {
if (message_thread_id <= 0) { check_message(chat_id_str, reply_to_message_id, reply_to_message_id <= 0 || allow_sending_without_reply,
return on_success(chat_id, 0, reply_to_message_id, std::move(query)); AccessRights::Write, "message to reply", std::move(query),
} [this, message_thread_id, on_success = std::move(on_success)](int64 chat_id, int64 reply_to_message_id,
PromisedQueryPtr query) mutable {
if (message_thread_id <= 0) {
return on_success(chat_id, 0, reply_to_message_id, std::move(query));
}
if (reply_to_message_id != 0) { if (reply_to_message_id != 0) {
const MessageInfo *message_info = get_message(chat_id, reply_to_message_id, true); const MessageInfo *message_info = get_message(chat_id, reply_to_message_id, true);
CHECK(message_info != nullptr); CHECK(message_info != nullptr);
if (message_info->message_thread_id != message_thread_id) { if (message_info->message_thread_id != message_thread_id) {
return fail_query_with_error(std::move(query), 400, "MESSAGE_THREAD_INVALID", return fail_query_with_error(std::move(query), 400, "MESSAGE_THREAD_INVALID",
"Replied message is not in the specified message thread"); "Replied message is not in the specified message thread");
} }
} }
if (reply_to_message_id == message_thread_id) { if (reply_to_message_id == message_thread_id) {
return on_success(chat_id, message_thread_id, reply_to_message_id, std::move(query)); return on_success(chat_id, message_thread_id, reply_to_message_id, std::move(query));
} }
send_request(make_object<td_api::getMessage>(chat_id, message_thread_id), send_request(make_object<td_api::getMessage>(chat_id, message_thread_id),
td::make_unique<TdOnCheckMessageThreadCallback<OnSuccess>>( td::make_unique<TdOnCheckMessageThreadCallback<OnSuccess>>(
this, chat_id, message_thread_id, reply_to_message_id, std::move(query), std::move(on_success))); this, chat_id, message_thread_id, reply_to_message_id, std::move(query),
std::move(on_success)));
});
} }
template <class OnSuccess> template <class OnSuccess>
@ -9693,33 +9699,27 @@ td::Status Client::process_send_media_group_query(PromisedQueryPtr &query) {
[this, chat_id = chat_id.str(), message_thread_id, reply_to_message_id, allow_sending_without_reply, disable_notification, [this, chat_id = chat_id.str(), message_thread_id, reply_to_message_id, allow_sending_without_reply, disable_notification,
protect_content, input_message_contents = std::move(input_message_contents), send_at = std::move(send_at)]( protect_content, input_message_contents = std::move(input_message_contents), send_at = std::move(send_at)](
object_ptr<td_api::ReplyMarkup> reply_markup, PromisedQueryPtr query) mutable { object_ptr<td_api::ReplyMarkup> reply_markup, PromisedQueryPtr query) mutable {
auto on_success = [this, message_thread_id, disable_notification, protect_content, auto on_success = [this, disable_notification, protect_content,
input_message_contents = std::move(input_message_contents), input_message_contents = std::move(input_message_contents),
reply_markup = std::move(reply_markup), send_at = std::move(send_at)](int64 chat_id, int64 reply_to_message_id, send_at = std::move(send_at),
reply_markup = std::move(reply_markup)](int64 chat_id, int64 message_thread_id,
int64 reply_to_message_id,
PromisedQueryPtr query) mutable { PromisedQueryPtr query) mutable {
auto on_message_thread_checked = [this, disable_notification, protect_content, auto &count = yet_unsent_message_count_[chat_id];
input_message_contents = std::move(input_message_contents), if (count >= MAX_CONCURRENTLY_SENT_CHAT_MESSAGES) {
reply_markup = std::move(reply_markup), send_at = std::move(send_at)]( return fail_query_flood_limit_exceeded(std::move(query));
int64 chat_id, int64 message_thread_id, int64 reply_to_message_id, }
PromisedQueryPtr query) mutable { auto message_count = input_message_contents.size();
auto &count = yet_unsent_message_count_[chat_id]; count += static_cast<int32>(message_count);
if (count >= MAX_CONCURRENTLY_SENT_CHAT_MESSAGES) {
return fail_query_flood_limit_exceeded(std::move(query));
}
auto message_count = input_message_contents.size();
count += static_cast<int32>(message_count);
send_request( send_request(
make_object<td_api::sendMessageAlbum>( make_object<td_api::sendMessageAlbum>(
chat_id, message_thread_id, get_input_message_reply_to(reply_to_message_id), chat_id, message_thread_id, get_input_message_reply_to(reply_to_message_id),
get_message_send_options(disable_notification, protect_content, std::move(send_at)), std::move(input_message_contents)), get_message_send_options(disable_notification, protect_content), std::move(send_at), std::move(input_message_contents)),
td::make_unique<TdOnSendMessageAlbumCallback>(this, chat_id, message_count, std::move(query))); td::make_unique<TdOnSendMessageAlbumCallback>(this, chat_id, message_count, std::move(query)));
};
check_message_thread(chat_id, message_thread_id, reply_to_message_id, std::move(query),
std::move(on_message_thread_checked));
}; };
check_message(chat_id, reply_to_message_id, reply_to_message_id <= 0 || allow_sending_without_reply, check_reply_parameters(chat_id, reply_to_message_id, allow_sending_without_reply, message_thread_id,
AccessRights::Write, "message to reply", std::move(query), std::move(on_success)); std::move(query), std::move(on_success));
}); });
return td::Status::OK(); return td::Status::OK();
} }
@ -11952,31 +11952,26 @@ void Client::do_send_message(object_ptr<td_api::InputMessageContent> input_messa
[this, chat_id = chat_id.str(), message_thread_id, reply_to_message_id, allow_sending_without_reply, disable_notification, [this, chat_id = chat_id.str(), message_thread_id, reply_to_message_id, allow_sending_without_reply, disable_notification,
protect_content, input_message_content = std::move(input_message_content), send_at = std::move(send_at)]( protect_content, input_message_content = std::move(input_message_content), send_at = std::move(send_at)](
object_ptr<td_api::ReplyMarkup> reply_markup, PromisedQueryPtr query) mutable { object_ptr<td_api::ReplyMarkup> reply_markup, PromisedQueryPtr query) mutable {
auto on_success = [this, message_thread_id, disable_notification, protect_content, auto on_success = [this, disable_notification, protect_content,
input_message_content = std::move(input_message_content), input_message_content = std::move(input_message_content),
reply_markup = std::move(reply_markup), send_at = std::move(send_at)](int64 chat_id, int64 reply_to_message_id, send_at = std::move(send_at),
reply_markup = std::move(reply_markup)](int64 chat_id, int64 message_thread_id,
int64 reply_to_message_id,
PromisedQueryPtr query) mutable { PromisedQueryPtr query) mutable {
auto on_message_thread_checked = auto &count = yet_unsent_message_count_[chat_id];
[this, disable_notification, protect_content, input_message_content = std::move(input_message_content), if (count >= MAX_CONCURRENTLY_SENT_CHAT_MESSAGES) {
reply_markup = std::move(reply_markup), send_at = std::move(send_at)](int64 chat_id, int64 message_thread_id, return fail_query_flood_limit_exceeded(std::move(query));
int64 reply_to_message_id, PromisedQueryPtr query) mutable { }
auto &count = yet_unsent_message_count_[chat_id]; count++;
if (count >= MAX_CONCURRENTLY_SENT_CHAT_MESSAGES) {
return fail_query_flood_limit_exceeded(std::move(query));
}
count++;
send_request( send_request(make_object<td_api::sendMessage>(chat_id, message_thread_id,
make_object<td_api::sendMessage>(chat_id, message_thread_id, get_input_message_reply_to(reply_to_message_id), get_input_message_reply_to(reply_to_message_id),
get_message_send_options(disable_notification, protect_content, std::move(send_at)), get_message_send_options(disable_notification, protect_content), std::move(send_at)),
std::move(reply_markup), std::move(input_message_content)), std::move(reply_markup), std::move(input_message_content)),
td::make_unique<TdOnSendMessageCallback>(this, chat_id, std::move(query))); td::make_unique<TdOnSendMessageCallback>(this, chat_id, std::move(query)));
};
check_message_thread(chat_id, message_thread_id, reply_to_message_id, std::move(query),
std::move(on_message_thread_checked));
}; };
check_message(chat_id, reply_to_message_id, reply_to_message_id <= 0 || allow_sending_without_reply, check_reply_parameters(chat_id, reply_to_message_id, allow_sending_without_reply, message_thread_id,
AccessRights::Write, "message to reply", std::move(query), std::move(on_success)); std::move(query), std::move(on_success));
}); });
} }

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

@ -349,8 +349,8 @@ class Client final : public WebhookActor::Callback {
td::Slice message_type, PromisedQueryPtr query, OnSuccess on_success); td::Slice message_type, PromisedQueryPtr query, OnSuccess on_success);
template <class OnSuccess> template <class OnSuccess>
void check_message_thread(int64 chat_id, int64 message_thread_id, int64 reply_to_message_id, PromisedQueryPtr query, void check_reply_parameters(td::Slice chat_id_str, int64 reply_to_message_id, bool allow_sending_without_reply,
OnSuccess on_success); int64 message_thread_id, PromisedQueryPtr query, OnSuccess on_success);
template <class OnSuccess> template <class OnSuccess>
void resolve_sticker_set(const td::string &sticker_set_name, PromisedQueryPtr query, OnSuccess on_success); void resolve_sticker_set(const td::string &sticker_set_name, PromisedQueryPtr query, OnSuccess on_success);