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

Support only_preview in sendInlineQueryResultMessage.

Browse Source
This commit is contained in:
levlam 2023-10-23 18:58:53 +03:00
parent 2c464baae1
commit 4027e73309
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
td/telegram/MessagesManager.cpp
View File

@ -26039,7 +26039,7 @@ void MessagesManager::do_send_bot_start_message(UserId bot_user_id, DialogId dia
std::move(input_peer), parameter, random_id); std::move(input_peer), parameter, random_id);
} }
Result<MessageId> MessagesManager::send_inline_query_result_message( Result<td_api::object_ptr<td_api::message>> MessagesManager::send_inline_query_result_message(
DialogId dialog_id, MessageId top_thread_message_id, td_api::object_ptr<td_api::InputMessageReplyTo> &&reply_to, DialogId dialog_id, MessageId top_thread_message_id, td_api::object_ptr<td_api::InputMessageReplyTo> &&reply_to,
tl_object_ptr<td_api::messageSendOptions> &&options, int64 query_id, const string &result_id, bool hide_via_bot) { tl_object_ptr<td_api::messageSendOptions> &&options, int64 query_id, const string &result_id, bool hide_via_bot) {
Dialog *d = get_dialog_force(dialog_id, "send_inline_query_result_message"); Dialog *d = get_dialog_force(dialog_id, "send_inline_query_result_message");
@ -26081,11 +26081,25 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(
TRY_STATUS(can_send_message_content(dialog_id, content->message_content.get(), false, td_)); TRY_STATUS(can_send_message_content(dialog_id, content->message_content.get(), false, td_));
TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, input_reply_to)); TRY_STATUS(can_use_top_thread_message_id(d, top_thread_message_id, input_reply_to));
auto message_content = dup_message_content(td_, dialog_id, content->message_content.get(),
MessageContentDupType::SendViaBot, MessageCopyOptions());
bool need_update_dialog_pos = false; bool need_update_dialog_pos = false;
Message *m = get_message_to_send(d, top_thread_message_id, input_reply_to, message_send_options, unique_ptr<Message> message;
dup_message_content(td_, dialog_id, content->message_content.get(), Message *m;
MessageContentDupType::SendViaBot, MessageCopyOptions()), if (message_send_options.only_preview) {
message =
create_message_to_send(d, top_thread_message_id, input_reply_to, message_send_options,
std::move(message_content), content->invert_media, false, nullptr, true, DialogId());
MessageId new_message_id = message_send_options.schedule_date != 0
? get_next_yet_unsent_scheduled_message_id(d, message_send_options.schedule_date)
: get_next_yet_unsent_message_id(d);
message->message_id = new_message_id;
m = message.get();
} else {
m = get_message_to_send(d, top_thread_message_id, input_reply_to, message_send_options, std::move(message_content),
content->invert_media, &need_update_dialog_pos, false, nullptr, true); content->invert_media, &need_update_dialog_pos, false, nullptr, true);
}
m->hide_via_bot = hide_via_bot; m->hide_via_bot = hide_via_bot;
if (!hide_via_bot) { if (!hide_via_bot) {
m->via_bot_user_id = td_->inline_queries_manager_->get_inline_bot_user_id(query_id); m->via_bot_user_id = td_->inline_queries_manager_->get_inline_bot_user_id(query_id);
@ -26096,6 +26110,10 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(
m->disable_web_page_preview = content->disable_web_page_preview; m->disable_web_page_preview = content->disable_web_page_preview;
m->clear_draft = !hide_via_bot; m->clear_draft = !hide_via_bot;
if (message_send_options.only_preview) {
return get_message_object(dialog_id, m, "send_inline_query_result_message");
}
if (m->clear_draft) { if (m->clear_draft) {
if (top_thread_message_id.is_valid()) { if (top_thread_message_id.is_valid()) {
set_dialog_draft_message(dialog_id, top_thread_message_id, nullptr).ignore(); set_dialog_draft_message(dialog_id, top_thread_message_id, nullptr).ignore();
@ -26112,13 +26130,12 @@ Result<MessageId> MessagesManager::send_inline_query_result_message(
if (to_secret) { if (to_secret) {
save_send_message_log_event(dialog_id, m); save_send_message_log_event(dialog_id, m);
do_send_message(dialog_id, m); do_send_message(dialog_id, m);
return m->message_id; } else {
}
save_send_inline_query_result_message_log_event(dialog_id, m, query_id, result_id); save_send_inline_query_result_message_log_event(dialog_id, m, query_id, result_id);
send_closure_later(actor_id(this), &MessagesManager::do_send_inline_query_result_message, dialog_id, m->message_id, send_closure_later(actor_id(this), &MessagesManager::do_send_inline_query_result_message, dialog_id, m->message_id,
query_id, result_id); query_id, result_id);
return m->message_id; }
return get_message_object(dialog_id, m, "send_inline_query_result_message");
} }
class MessagesManager::SendInlineQueryResultMessageLogEvent { class MessagesManager::SendInlineQueryResultMessageLogEvent {

7
td/telegram/MessagesManager.h
View File

@ -447,10 +447,9 @@ class MessagesManager final : public Actor {
Result<MessageId> send_bot_start_message(UserId bot_user_id, DialogId dialog_id, Result<MessageId> send_bot_start_message(UserId bot_user_id, DialogId dialog_id,
const string &parameter) TD_WARN_UNUSED_RESULT; const string &parameter) TD_WARN_UNUSED_RESULT;
Result<MessageId> send_inline_query_result_message(DialogId dialog_id, MessageId top_thread_message_id, Result<td_api::object_ptr<td_api::message>> send_inline_query_result_message(
td_api::object_ptr<td_api::InputMessageReplyTo> &&reply_to, DialogId dialog_id, MessageId top_thread_message_id, td_api::object_ptr<td_api::InputMessageReplyTo> &&reply_to,
tl_object_ptr<td_api::messageSendOptions> &&options, tl_object_ptr<td_api::messageSendOptions> &&options, int64 query_id, const string &result_id,
int64 query_id, const string &result_id,
bool hide_via_bot) TD_WARN_UNUSED_RESULT; bool hide_via_bot) TD_WARN_UNUSED_RESULT;
Result<td_api::object_ptr<td_api::messages>> forward_messages( Result<td_api::object_ptr<td_api::messages>> forward_messages(

18
td/telegram/Td.cpp
View File

@ -5610,18 +5610,14 @@ void Td::on_request(uint64 id, td_api::sendInlineQueryResultMessage &request) {
CHECK_IS_USER(); CHECK_IS_USER();
CLEAN_INPUT_STRING(request.result_id_); CLEAN_INPUT_STRING(request.result_id_);
DialogId dialog_id(request.chat_id_); auto r_sent_message = messages_manager_->send_inline_query_result_message(
auto r_new_message_id = messages_manager_->send_inline_query_result_message( DialogId(request.chat_id_), MessageId(request.message_thread_id_), std::move(request.reply_to_),
dialog_id, MessageId(request.message_thread_id_), std::move(request.reply_to_), std::move(request.options_), std::move(request.options_), request.query_id_, request.result_id_, request.hide_via_bot_);
request.query_id_, request.result_id_, request.hide_via_bot_); if (r_sent_message.is_error()) {
if (r_new_message_id.is_error()) { send_closure(actor_id(this), &Td::send_error, id, r_sent_message.move_as_error());
return send_closure(actor_id(this), &Td::send_error, id, r_new_message_id.move_as_error()); } else {
send_closure(actor_id(this), &Td::send_result, id, r_sent_message.move_as_ok());
} }
CHECK(r_new_message_id.ok().is_valid() || r_new_message_id.ok().is_valid_scheduled());
send_closure(
actor_id(this), &Td::send_result, id,
messages_manager_->get_message_object({dialog_id, r_new_message_id.ok()}, "sendInlineQueryResultMessage"));
} }
void Td::on_request(uint64 id, td_api::addLocalMessage &request) { void Td::on_request(uint64 id, td_api::addLocalMessage &request) {