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

Keep and pass to the server initial top_thread_message_id specified by the app.

Browse Source
This commit is contained in:
levlam 2024-01-31 01:45:20 +03:00
parent 3dbf71e886
commit 2a81a11e61
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6546,7 +6546,7 @@ updateDeleteMessages chat_id:int53 message_ids:vector<int53> is_permanent:Bool f
//@description A message sender activity in the chat has changed
//@chat_id Chat identifier
//@message_thread_id If not 0, a message thread identifier in which the action was performed
//@message_thread_id If not 0, the message thread identifier in which the action was performed
//@sender_id Identifier of a message sender performing the action
//@action The action
updateChatAction chat_id:int53 message_thread_id:int53 sender_id:MessageSender action:ChatAction = Update;
@ -7493,7 +7493,7 @@ setChatMessageSender chat_id:int53 message_sender_id:MessageSender = Ok;
//@description Sends a message. Returns the sent message
//@chat_id Target chat
//@message_thread_id If not 0, a message thread identifier in which the message will be sent
//@message_thread_id If not 0, the message thread identifier in which the message will be sent
//@reply_to Information about the message or story to be replied; pass null if none
//@options Options to be used to send the message; pass null to use default options
//@reply_markup Markup for replying to the message; pass null if none; for bots only
@ -7502,7 +7502,7 @@ sendMessage chat_id:int53 message_thread_id:int53 reply_to:InputMessageReplyTo o
//@description Sends 2-10 messages grouped together into an album. Currently, only audio, document, photo and video messages can be grouped into an album. Documents and audio files can be only grouped in an album with messages of the same type. Returns sent messages
//@chat_id Target chat
//@message_thread_id If not 0, a message thread identifier in which the messages will be sent
//@message_thread_id If not 0, the message thread identifier in which the messages will be sent
//@reply_to Information about the message or story to be replied; pass null if none
//@options Options to be used to send the messages; pass null to use default options
//@input_message_contents Contents of messages to be sent. At most 10 messages can be added to an album
@ -7516,7 +7516,7 @@ sendBotStartMessage bot_user_id:int53 chat_id:int53 parameter:string = Message;
//@description Sends the result of an inline query as a message. Returns the sent message. Always clears a chat draft message
//@chat_id Target chat
//@message_thread_id If not 0, a message thread identifier in which the message will be sent
//@message_thread_id If not 0, the message thread identifier in which the message will be sent
//@reply_to Information about the message or story to be replied; pass null if none
//@options Options to be used to send the message; pass null to use default options
//@query_id Identifier of the inline query
@ -7526,7 +7526,7 @@ sendInlineQueryResultMessage chat_id:int53 message_thread_id:int53 reply_to:Inpu
//@description Forwards previously sent messages. Returns the forwarded messages in the same order as the message identifiers passed in message_ids. If a message can't be forwarded, null will be returned instead of the message
//@chat_id Identifier of the chat to which to forward messages
//@message_thread_id If not 0, a message thread identifier in which the message will be sent; for forum threads only
//@message_thread_id If not 0, the message thread identifier in which the message will be sent; for forum threads only
//@from_chat_id Identifier of the chat from which to forward messages
//@message_ids Identifiers of the messages to forward. Message identifiers must be in a strictly increasing order. At most 100 messages can be forwarded simultaneously. A message can be forwarded only if message.can_be_forwarded
//@options Options to be used to send the messages; pass null to use default options
@ -7917,7 +7917,7 @@ sendWebAppData bot_user_id:int53 button_text:string data:string = Ok;
//@url The URL from an inlineKeyboardButtonTypeWebApp button, a botMenuButton button, an internalLinkTypeAttachmentMenuBot link, or an empty string otherwise
//@theme Preferred Web App theme; pass null to use the default theme
//@application_name Short name of the application; 0-64 English letters, digits, and underscores
//@message_thread_id If not 0, a message thread identifier in which the message will be sent
//@message_thread_id If not 0, the message thread identifier in which the message will be sent
//@reply_to Information about the message or story to be replied in the message sent by the Web App; pass null if none
openWebApp chat_id:int53 bot_user_id:int53 url:string theme:themeParameters application_name:string message_thread_id:int53 reply_to:InputMessageReplyTo = WebAppInfo;
@ -7982,7 +7982,7 @@ getInlineGameHighScores inline_message_id:string user_id:int53 = GameHighScores;
deleteChatReplyMarkup chat_id:int53 message_id:int53 = Ok;
//@description Sends a notification about user activity in a chat @chat_id Chat identifier @message_thread_id If not 0, a message thread identifier in which the action was performed @action The action description; pass null to cancel the currently active action
//@description Sends a notification about user activity in a chat @chat_id Chat identifier @message_thread_id If not 0, the message thread identifier in which the action was performed @action The action description; pass null to cancel the currently active action
sendChatAction chat_id:int53 message_thread_id:int53 action:ChatAction = Ok;
@ -8208,7 +8208,7 @@ setChatTheme chat_id:int53 theme_name:string = Ok;
//@description Changes the draft message in a chat
//@chat_id Chat identifier
//@message_thread_id If not 0, a message thread identifier in which the draft was changed
//@message_thread_id If not 0, the message thread identifier in which the draft was changed
//@draft_message New draft message; pass null to remove the draft. All files in draft message content must be of the type inputFileLocal. Media thumbnails and captions are ignored
setChatDraftMessage chat_id:int53 message_thread_id:int53 draft_message:draftMessage = Ok;

26
td/telegram/MessagesManager.cpp
View File

@ -4308,6 +4308,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
bool has_replied_message_info = !replied_message_info.is_empty();
bool has_forward_info = forward_info != nullptr;
bool has_saved_messages_topic_id = saved_messages_topic_id.is_valid();
bool has_initial_top_thread_message_id = !message_id.is_any_server() && initial_top_thread_message_id.is_valid();
BEGIN_STORE_FLAGS();
STORE_FLAG(is_channel_post);
STORE_FLAG(is_outgoing);
@ -4390,6 +4391,7 @@ void MessagesManager::Message::store(StorerT &storer) const {
STORE_FLAG(has_replied_message_info);
STORE_FLAG(has_forward_info);
STORE_FLAG(has_saved_messages_topic_id);
STORE_FLAG(has_initial_top_thread_message_id);
END_STORE_FLAGS();
}
@ -4507,6 +4509,9 @@ void MessagesManager::Message::store(StorerT &storer) const {
if (has_saved_messages_topic_id) {
store(saved_messages_topic_id, storer);
}
if (has_initial_top_thread_message_id) {
store(initial_top_thread_message_id, storer);
}
}
// do not forget to resolve message dependencies
@ -4561,6 +4566,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
bool has_replied_message_info = false;
bool has_forward_info = false;
bool has_saved_messages_topic_id = false;
bool has_initial_top_thread_message_id = false;
BEGIN_PARSE_FLAGS();
PARSE_FLAG(is_channel_post);
PARSE_FLAG(is_outgoing);
@ -4643,6 +4649,7 @@ void MessagesManager::Message::parse(ParserT &parser) {
PARSE_FLAG(has_replied_message_info);
PARSE_FLAG(has_forward_info);
PARSE_FLAG(has_saved_messages_topic_id);
PARSE_FLAG(has_initial_top_thread_message_id);
END_PARSE_FLAGS();
}
@ -4824,6 +4831,9 @@ void MessagesManager::Message::parse(ParserT &parser) {
if (has_saved_messages_topic_id) {
parse(saved_messages_topic_id, parser);
}
if (has_initial_top_thread_message_id) {
parse(initial_top_thread_message_id, parser);
}
CHECK(content != nullptr);
is_content_secret |= ttl.is_secret_message_content(content->get_type()); // repair is_content_secret for old messages
@ -23288,6 +23298,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::create_message_to_send(
int64 reply_to_random_id = 0;
bool is_topic_message = false;
auto initial_top_thread_message_id = top_thread_message_id;
auto same_chat_reply_to_message_id = input_reply_to.get_same_chat_reply_to_message_id();
if (same_chat_reply_to_message_id.is_valid() || same_chat_reply_to_message_id.is_valid_scheduled()) {
// the message was forcely preloaded in get_message_input_reply_to
@ -23356,6 +23367,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::create_message_to_send(
m->input_reply_to = std::move(input_reply_to);
m->reply_to_random_id = reply_to_random_id;
m->top_thread_message_id = top_thread_message_id;
m->initial_top_thread_message_id = initial_top_thread_message_id;
m->is_topic_message = is_topic_message;
m->is_channel_post = is_channel_post;
m->is_outgoing = is_scheduled || dialog_id != DialogId(my_id);
@ -24425,7 +24437,7 @@ void MessagesManager::on_message_media_uploaded(DialogId dialog_id, const Messag
int64 random_id = begin_send_message(dialog_id, m);
td_->create_handler<SendMediaQuery>()->send(
file_id, thumbnail_file_id, get_message_flags(m), dialog_id, get_send_message_as_input_peer(m),
*get_message_input_reply_to(m), m->top_thread_message_id, get_message_schedule_date(m),
*get_message_input_reply_to(m), m->initial_top_thread_message_id, get_message_schedule_date(m),
get_input_reply_markup(td_->contacts_manager_.get(), m->reply_markup),
get_input_message_entities(td_->contacts_manager_.get(), caption, "on_message_media_uploaded"),
caption == nullptr ? "" : caption->text, std::move(input_media), m->content->get_type(), m->is_copy,
@ -24740,7 +24752,7 @@ void MessagesManager::do_send_message_group(int64 media_album_id) {
}
input_reply_to = get_message_input_reply_to(m);
top_thread_message_id = m->top_thread_message_id;
top_thread_message_id = m->initial_top_thread_message_id;
flags = get_message_flags(m);
schedule_date = get_message_schedule_date(m);
is_copy = m->is_copy;
@ -24839,14 +24851,14 @@ void MessagesManager::on_text_message_ready_to_send(DialogId dialog_id, MessageI
if (input_media == nullptr) {
td_->create_handler<SendMessageQuery>()->send(
get_message_flags(m), dialog_id, get_send_message_as_input_peer(m), *get_message_input_reply_to(m),
m->top_thread_message_id, get_message_schedule_date(m),
m->initial_top_thread_message_id, get_message_schedule_date(m),
get_input_reply_markup(td_->contacts_manager_.get(), m->reply_markup),
get_input_message_entities(td_->contacts_manager_.get(), message_text, "do_send_message"), message_text->text,
m->is_copy, random_id, &m->send_query_ref);
} else {
td_->create_handler<SendMediaQuery>()->send(
FileId(), FileId(), get_message_flags(m), dialog_id, get_send_message_as_input_peer(m),
*get_message_input_reply_to(m), m->top_thread_message_id, get_message_schedule_date(m),
*get_message_input_reply_to(m), m->initial_top_thread_message_id, get_message_schedule_date(m),
get_input_reply_markup(td_->contacts_manager_.get(), m->reply_markup),
get_input_message_entities(td_->contacts_manager_.get(), message_text, "do_send_message"), message_text->text,
std::move(input_media), MessageContentType::Text, m->is_copy, random_id, &m->send_query_ref);
@ -25249,8 +25261,8 @@ void MessagesManager::do_send_inline_query_result_message(DialogId dialog_id, Me
flags |= telegram_api::messages_sendInlineBotResult::HIDE_VIA_MASK;
}
m->send_query_ref = td_->create_handler<SendInlineBotResultQuery>()->send(
flags, dialog_id, get_send_message_as_input_peer(m), *get_message_input_reply_to(m), m->top_thread_message_id,
get_message_schedule_date(m), random_id, query_id, result_id);
flags, dialog_id, get_send_message_as_input_peer(m), *get_message_input_reply_to(m),
m->initial_top_thread_message_id, get_message_schedule_date(m), random_id, query_id, result_id);
}
bool MessagesManager::can_edit_message(DialogId dialog_id, const Message *m, bool is_editing,
@ -26640,7 +26652,7 @@ void MessagesManager::do_forward_messages(DialogId to_dialog_id, DialogId from_d
vector<int64> random_ids =
transform(messages, [this, to_dialog_id](const Message *m) { return begin_send_message(to_dialog_id, m); });
send_closure_later(actor_id(this), &MessagesManager::send_forward_message_query, flags, to_dialog_id,
messages[0]->top_thread_message_id, from_dialog_id, std::move(as_input_peer), message_ids,
messages[0]->initial_top_thread_message_id, from_dialog_id, std::move(as_input_peer), message_ids,
std::move(random_ids), schedule_date, get_erase_log_event_promise(log_event_id));
}

7
td/telegram/MessagesManager.h
View File

@ -1040,9 +1040,10 @@ class MessagesManager final : public Actor {
MessageId linked_top_thread_message_id;
vector<MessageId> local_thread_message_ids;
MessageInputReplyTo input_reply_to; // for send_message
int64 reply_to_random_id = 0; // for send_message
string send_emoji; // for send_message
MessageId initial_top_thread_message_id; // for send_message
MessageInputReplyTo input_reply_to; // for send_message
int64 reply_to_random_id = 0; // for send_message
string send_emoji; // for send_message
UserId via_bot_user_id;