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

Improve return type of searchChatMessages.

Browse Source
This commit is contained in:
levlam 2022-12-28 18:42:11 +03:00
parent 630101358b
commit 9663dc98b5
5 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1075,6 +1075,9 @@ messages total_count:int32 messages:vector<message> = Messages;
//@description Contains a list of messages found by a search @total_count Approximate total number of messages found; -1 if unknown @messages List of messages @next_offset The offset for the next request. If empty, there are no more results //@description Contains a list of messages found by a search @total_count Approximate total number of messages found; -1 if unknown @messages List of messages @next_offset The offset for the next request. If empty, there are no more results
foundMessages total_count:int32 messages:vector<message> next_offset:string = FoundMessages; foundMessages total_count:int32 messages:vector<message> next_offset:string = FoundMessages;
//@description Contains a list of messages found by a search in a given chat @total_count Approximate total number of messages found; -1 if unknown @messages List of messages @next_from_message_id The offset for the next request. If 0, there are no more results
foundChatMessages total_count:int32 messages:vector<message> next_from_message_id:int53 = FoundChatMessages;
//@description Contains information about a message in a specific position @position 0-based message position in the full list of suitable messages @message_id Message identifier @date Point in time (Unix timestamp) when the message was sent //@description Contains information about a message in a specific position @position 0-based message position in the full list of suitable messages @message_id Message identifier @date Point in time (Unix timestamp) when the message was sent
messagePosition position:int32 message_id:int53 date:int32 = MessagePosition; messagePosition position:int32 message_id:int53 date:int32 = MessagePosition;
@ -5780,7 +5783,7 @@ deleteChat chat_id:int53 = Ok;
//-For optimal performance, the number of returned messages is chosen by TDLib and can be smaller than the specified limit //-For optimal performance, the number of returned messages is chosen by TDLib and can be smaller than the specified limit
//@filter Additional filter for messages to search; pass null to search for all messages //@filter Additional filter for messages to search; pass null to search for all messages
//@message_thread_id If not 0, only messages in the specified thread will be returned; supergroups only //@message_thread_id If not 0, only messages in the specified thread will be returned; supergroups only
searchChatMessages chat_id:int53 query:string sender_id:MessageSender from_message_id:int53 offset:int32 limit:int32 filter:SearchMessagesFilter message_thread_id:int53 = Messages; searchChatMessages chat_id:int53 query:string sender_id:MessageSender from_message_id:int53 offset:int32 limit:int32 filter:SearchMessagesFilter message_thread_id:int53 = FoundChatMessages;
//@description Searches for messages in all chats except secret chats. Returns the results in reverse chronological order (i.e., in order of decreasing (date, chat_id, message_id)). //@description Searches for messages in all chats except secret chats. Returns the results in reverse chronological order (i.e., in order of decreasing (date, chat_id, message_id)).
//-For optimal performance, the number of returned messages is chosen by TDLib and can be smaller than the specified limit //-For optimal performance, the number of returned messages is chosen by TDLib and can be smaller than the specified limit

44
td/telegram/MessagesManager.cpp
View File

@ -10342,7 +10342,7 @@ void MessagesManager::on_get_dialog_messages_search_result(
auto it = found_dialog_messages_.find(random_id); auto it = found_dialog_messages_.find(random_id);
CHECK(it != found_dialog_messages_.end()); CHECK(it != found_dialog_messages_.end());
auto &result = it->second.second; auto &result = it->second.message_ids;
CHECK(result.empty()); CHECK(result.empty());
MessageId first_added_message_id; MessageId first_added_message_id;
if (messages.empty()) { if (messages.empty()) {
@ -10352,9 +10352,14 @@ void MessagesManager::on_get_dialog_messages_search_result(
} }
bool can_be_in_different_dialog = top_thread_message_id.is_valid() && is_broadcast_channel(dialog_id); bool can_be_in_different_dialog = top_thread_message_id.is_valid() && is_broadcast_channel(dialog_id);
DialogId real_dialog_id; DialogId real_dialog_id;
MessageId next_from_message_id;
Dialog *d = get_dialog(dialog_id); Dialog *d = get_dialog(dialog_id);
CHECK(d != nullptr); CHECK(d != nullptr);
for (auto &message : messages) { for (auto &message : messages) {
auto message_id = MessageId::get_message_id(message, false);
if (message_id.is_valid() && message_id < next_from_message_id) {
next_from_message_id = message_id;
}
auto new_full_message_id = on_get_message(std::move(message), false, dialog_id.get_type() == DialogType::Channel, auto new_full_message_id = on_get_message(std::move(message), false, dialog_id.get_type() == DialogType::Channel,
false, false, false, "on_get_dialog_messages_search_result"); false, false, false, "on_get_dialog_messages_search_result");
if (new_full_message_id == FullMessageId()) { if (new_full_message_id == FullMessageId()) {
@ -10380,7 +10385,7 @@ void MessagesManager::on_get_dialog_messages_search_result(
} }
} }
auto message_id = new_full_message_id.get_message_id(); CHECK(message_id == new_full_message_id.get_message_id());
if (filter == MessageSearchFilter::UnreadMention && message_id <= d->last_read_all_mentions_message_id && if (filter == MessageSearchFilter::UnreadMention && message_id <= d->last_read_all_mentions_message_id &&
!real_dialog_id.is_valid()) { !real_dialog_id.is_valid()) {
total_count--; total_count--;
@ -10437,7 +10442,8 @@ void MessagesManager::on_get_dialog_messages_search_result(
} }
} }
it->second.first = total_count; it->second.total_count = total_count;
it->second.next_from_message_id = next_from_message_id;
promise.set_value(Unit()); promise.set_value(Unit());
} }
@ -22660,7 +22666,7 @@ std::pair<DialogId, vector<MessageId>> MessagesManager::get_message_thread_histo
// request has already been sent before // request has already been sent before
auto it = found_dialog_messages_.find(random_id); auto it = found_dialog_messages_.find(random_id);
CHECK(it != found_dialog_messages_.end()); CHECK(it != found_dialog_messages_.end());
auto result = std::move(it->second.second); auto result = std::move(it->second.message_ids);
found_dialog_messages_.erase(it); found_dialog_messages_.erase(it);
auto dialog_id_it = found_dialog_messages_dialog_id_.find(random_id); auto dialog_id_it = found_dialog_messages_dialog_id_.find(random_id);
@ -22898,7 +22904,7 @@ void MessagesManager::on_get_message_calendar_from_database(int64 random_id, Dia
promise.set_value(Unit()); promise.set_value(Unit());
} }
std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages( MessagesManager::FoundDialogMessages MessagesManager::search_dialog_messages(
DialogId dialog_id, const string &query, const td_api::object_ptr<td_api::MessageSender> &sender, DialogId dialog_id, const string &query, const td_api::object_ptr<td_api::MessageSender> &sender,
MessageId from_message_id, int32 offset, int32 limit, MessageSearchFilter filter, MessageId top_thread_message_id, MessageId from_message_id, int32 offset, int32 limit, MessageSearchFilter filter, MessageId top_thread_message_id,
int64 &random_id, bool use_db, Promise<Unit> &&promise) { int64 &random_id, bool use_db, Promise<Unit> &&promise) {
@ -22918,7 +22924,7 @@ std::pair<int32, vector<MessageId>> MessagesManager::search_dialog_messages(
<< oneline(to_string(sender)) << " in thread of " << top_thread_message_id << " filtered by " << filter << oneline(to_string(sender)) << " in thread of " << top_thread_message_id << " filtered by " << filter
<< " from " << from_message_id << " with offset " << offset << " and limit " << limit; << " from " << from_message_id << " with offset " << offset << " and limit " << limit;
std::pair<int32, vector<MessageId>> result; FoundDialogMessages result;
if (limit <= 0) { if (limit <= 0) {
promise.set_error(Status::Error(400, "Parameter limit must be positive")); promise.set_error(Status::Error(400, "Parameter limit must be positive"));
return result; return result;
@ -23589,12 +23595,16 @@ void MessagesManager::on_search_dialog_message_db_result(int64 random_id, Dialog
auto it = found_dialog_messages_.find(random_id); auto it = found_dialog_messages_.find(random_id);
CHECK(it != found_dialog_messages_.end()); CHECK(it != found_dialog_messages_.end());
auto &res = it->second.second; auto &res = it->second.message_ids;
MessageId next_from_message_id;
res.reserve(messages.size()); res.reserve(messages.size());
for (auto &message : messages) { for (auto &message : messages) {
auto m = on_get_message_from_database(d, message, false, "on_search_dialog_message_db_result"); auto m = on_get_message_from_database(d, message, false, "on_search_dialog_message_db_result");
if (m != nullptr && first_db_message_id <= m->message_id) { if (m != nullptr && first_db_message_id <= m->message_id) {
if (m->message_id < next_from_message_id) {
next_from_message_id = m->message_id;
}
if (filter == MessageSearchFilter::UnreadMention && !m->contains_unread_mention) { if (filter == MessageSearchFilter::UnreadMention && !m->contains_unread_mention) {
// skip already read by d->last_read_all_mentions_message_id mentions // skip already read by d->last_read_all_mentions_message_id mentions
} else { } else {
@ -23625,7 +23635,8 @@ void MessagesManager::on_search_dialog_message_db_result(int64 random_id, Dialog
} }
on_dialog_updated(dialog_id, "on_search_dialog_message_db_result"); on_dialog_updated(dialog_id, "on_search_dialog_message_db_result");
} }
it->second.first = message_count; it->second.total_count = message_count;
it->second.next_from_message_id = next_from_message_id;
if (res.empty() && first_db_message_id != MessageId::min() && dialog_id.get_type() != DialogType::SecretChat) { if (res.empty() && first_db_message_id != MessageId::min() && dialog_id.get_type() != DialogType::SecretChat) {
LOG(INFO) << "No messages found in database"; LOG(INFO) << "No messages found in database";
found_dialog_messages_.erase(it); found_dialog_messages_.erase(it);
@ -23638,6 +23649,23 @@ void MessagesManager::on_search_dialog_message_db_result(int64 random_id, Dialog
promise.set_value(Unit()); promise.set_value(Unit());
} }
td_api::object_ptr<td_api::foundChatMessages> MessagesManager::get_found_chat_messages_object(
DialogId dialog_id, const FoundDialogMessages &found_dialog_messages, const char *source) {
auto *d = get_dialog(dialog_id);
CHECK(d != nullptr);
vector<tl_object_ptr<td_api::message>> result;
result.reserve(found_dialog_messages.message_ids.size());
for (const auto &message_id : found_dialog_messages.message_ids) {
auto message = get_message_object(dialog_id, get_message_force(d, message_id, source), source);
if (message != nullptr) {
result.push_back(std::move(message));
}
}
return td_api::make_object<td_api::foundChatMessages>(found_dialog_messages.total_count, std::move(result),
found_dialog_messages.next_from_message_id.get());
}
td_api::object_ptr<td_api::foundMessages> MessagesManager::get_found_messages_object( td_api::object_ptr<td_api::foundMessages> MessagesManager::get_found_messages_object(
const FoundMessages &found_messages, const char *source) { const FoundMessages &found_messages, const char *source) {
vector<tl_object_ptr<td_api::message>> result; vector<tl_object_ptr<td_api::message>> result;

27
td/telegram/MessagesManager.h
View File

@ -748,12 +748,20 @@ class MessagesManager final : public Actor {
MessageSearchFilter filter, int64 &random_id, MessageSearchFilter filter, int64 &random_id,
bool use_db, Promise<Unit> &&promise); bool use_db, Promise<Unit> &&promise);
std::pair<int32, vector<MessageId>> search_dialog_messages(DialogId dialog_id, const string &query, struct FoundDialogMessages {
const td_api::object_ptr<td_api::MessageSender> &sender, vector<MessageId> message_ids;
MessageId from_message_id, int32 offset, int32 limit, MessageId next_from_message_id;
MessageSearchFilter filter, int32 total_count = 0;
MessageId top_thread_message_id, int64 &random_id, };
bool use_db, Promise<Unit> &&promise);
td_api::object_ptr<td_api::foundChatMessages> get_found_chat_messages_object(
DialogId dialog_id, const FoundDialogMessages &found_dialog_messages, const char *source);
FoundDialogMessages search_dialog_messages(DialogId dialog_id, const string &query,
const td_api::object_ptr<td_api::MessageSender> &sender,
MessageId from_message_id, int32 offset, int32 limit,
MessageSearchFilter filter, MessageId top_thread_message_id,
int64 &random_id, bool use_db, Promise<Unit> &&promise);
struct FoundMessages { struct FoundMessages {
vector<FullMessageId> full_message_ids; vector<FullMessageId> full_message_ids;
@ -3548,10 +3556,9 @@ class MessagesManager final : public Actor {
FlatHashMap<int64, FullMessageId> get_dialog_message_by_date_results_; FlatHashMap<int64, FullMessageId> get_dialog_message_by_date_results_;
FlatHashMap<int64, td_api::object_ptr<td_api::messageCalendar>> found_dialog_message_calendars_; FlatHashMap<int64, td_api::object_ptr<td_api::messageCalendar>> found_dialog_message_calendars_;
FlatHashMap<int64, std::pair<int32, vector<MessageId>>> FlatHashMap<int64, FoundDialogMessages> found_dialog_messages_; // random_id -> FoundDialogMessages
found_dialog_messages_; // random_id -> [total_count, [message_id]...] FlatHashMap<int64, DialogId> found_dialog_messages_dialog_id_; // random_id -> dialog_id
FlatHashMap<int64, DialogId> found_dialog_messages_dialog_id_; // random_id -> dialog_id FlatHashMap<int64, FoundMessages> found_messages_; // random_id -> FoundMessages
FlatHashMap<int64, FoundMessages> found_messages_; // random_id -> FoundMessages
FlatHashMap<int64, std::pair<int32, vector<FullMessageId>>> FlatHashMap<int64, std::pair<int32, vector<FullMessageId>>>
found_call_messages_; // random_id -> [total_count, [full_message_id]...] found_call_messages_; // random_id -> [total_count, [full_message_id]...]

1
td/telegram/OptionManager.cpp
View File

@ -120,6 +120,7 @@ OptionManager::OptionManager(Td *td)
} }
set_option_empty("themed_emoji_statuses_sticker_set_id"); set_option_empty("themed_emoji_statuses_sticker_set_id");
set_option_empty("themed_premium_statuses_sticker_set_id");
} }
OptionManager::~OptionManager() = default; OptionManager::~OptionManager() = default;

9
td/telegram/Td.cpp
View File

@ -1346,7 +1346,7 @@ class SearchChatMessagesRequest final : public RequestActor<> {
MessageId top_thread_message_id_; MessageId top_thread_message_id_;
int64 random_id_; int64 random_id_;
std::pair<int32, vector<MessageId>> messages_; MessagesManager::FoundDialogMessages messages_;
void do_run(Promise<Unit> &&promise) final { void do_run(Promise<Unit> &&promise) final {
messages_ = td_->messages_manager_->search_dialog_messages(dialog_id_, query_, sender_id_, from_message_id_, messages_ = td_->messages_manager_->search_dialog_messages(dialog_id_, query_, sender_id_, from_message_id_,
@ -1355,14 +1355,13 @@ class SearchChatMessagesRequest final : public RequestActor<> {
} }
void do_send_result() final { void do_send_result() final {
send_result(td_->messages_manager_->get_messages_object(messages_.first, dialog_id_, messages_.second, true, send_result(
"SearchChatMessagesRequest")); td_->messages_manager_->get_found_chat_messages_object(dialog_id_, messages_, "SearchChatMessagesRequest"));
} }
void do_send_error(Status &&status) final { void do_send_error(Status &&status) final {
if (status.message() == "SEARCH_QUERY_EMPTY") { if (status.message() == "SEARCH_QUERY_EMPTY") {
messages_.first = 0; messages_ = {};
messages_.second.clear();
return do_send_result(); return do_send_result();
} }
send_error(std::move(status)); send_error(std::move(status));