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

Move chat list check inside search_messages.

Browse Source
This commit is contained in:
levlam 2024-05-10 14:15:02 +03:00
parent 1d9f7c0482
commit cf4cfc3c57
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/MessagesManager.cpp
View File

@ -2123,7 +2123,6 @@ class SearchMessagesGlobalQuery final : public Td::ResultHandler {
void on_error(Status status) final {
if (status.message() == "SEARCH_QUERY_EMPTY") {
return promise_.set_value(td_->messages_manager_->get_found_messages_object({}, "SearchMessagesGlobalQuery"));
;
}
promise_.set_error(std::move(status));
}
@ -21075,10 +21074,13 @@ void MessagesManager::on_message_db_calls_result(Result<MessageDbCallsResult> re
promise.set_value(Unit());
}
void MessagesManager::search_messages(FolderId folder_id, bool ignore_folder_id, bool broadcasts_only,
void MessagesManager::search_messages(DialogListId dialog_list_id, bool ignore_folder_id, bool broadcasts_only,
const string &query, const string &offset, int32 limit,
MessageSearchFilter filter, int32 min_date, int32 max_date,
Promise<td_api::object_ptr<td_api::foundMessages>> &&promise) {
if (!dialog_list_id.is_folder()) {
return promise.set_error(Status::Error(400, "Wrong chat list specified"));
}
if (limit <= 0) {
return promise.set_error(Status::Error(400, "Parameter limit must be positive"));
}
@ -21133,8 +21135,8 @@ void MessagesManager::search_messages(FolderId folder_id, bool ignore_folder_id,
<< offset << " and limit " << limit;
td_->create_handler<SearchMessagesGlobalQuery>(std::move(promise))
->send(folder_id, ignore_folder_id, broadcasts_only, query, offset_date, offset_dialog_id, offset_message_id,
limit, filter, min_date, max_date);
->send(dialog_list_id.get_folder_id(), ignore_folder_id, broadcasts_only, query, offset_date, offset_dialog_id,
offset_message_id, limit, filter, min_date, max_date);
}
int64 MessagesManager::get_dialog_message_by_date(DialogId dialog_id, int32 date, Promise<Unit> &&promise) {

2
td/telegram/MessagesManager.h
View File

@ -733,7 +733,7 @@ class MessagesManager final : public Actor {
FoundMessages offline_search_messages(DialogId dialog_id, const string &query, string offset, int32 limit,
MessageSearchFilter filter, int64 &random_id, Promise<Unit> &&promise);
void search_messages(FolderId folder_id, bool ignore_folder_id, bool broadcasts_only, const string &query,
void search_messages(DialogListId dialog_list_id, bool ignore_folder_id, bool broadcasts_only, const string &query,
const string &offset, int32 limit, MessageSearchFilter filter, int32 min_date, int32 max_date,
Promise<td_api::object_ptr<td_api::foundMessages>> &&promise);

6
td/telegram/Td.cpp
View File

@ -5376,12 +5376,8 @@ void Td::on_request(uint64 id, td_api::searchMessages &request) {
CHECK_IS_USER();
CLEAN_INPUT_STRING(request.query_);
CLEAN_INPUT_STRING(request.offset_);
DialogListId dialog_list_id(request.chat_list_);
if (!dialog_list_id.is_folder()) {
return send_error_raw(id, 400, "Wrong chat list specified");
}
CREATE_REQUEST_PROMISE();
messages_manager_->search_messages(dialog_list_id.get_folder_id(), request.chat_list_ == nullptr,
messages_manager_->search_messages(DialogListId(request.chat_list_), request.chat_list_ == nullptr,
request.only_in_channels_, std::move(request.query_), std::move(request.offset_),
request.limit_, get_message_search_filter(request.filter_), request.min_date_,
request.max_date_, std::move(promise));