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

Improve next_offset in getMessagePublicForwards.

Browse Source
This commit is contained in:
levlam 2022-12-25 22:59:57 +03:00
parent fc2ab0a7ab
commit f694687e47
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
td/telegram/MessagesManager.cpp
View File

@ -2941,7 +2941,7 @@ class GetMessagePublicForwardsQuery final : public Td::ResultHandler {
} else { } else {
auto info = result.move_as_ok(); auto info = result.move_as_ok();
send_closure(actor_id, &MessagesManager::on_get_message_public_forwards, info.total_count, send_closure(actor_id, &MessagesManager::on_get_message_public_forwards, info.total_count,
std::move(info.messages), std::move(promise)); std::move(info.messages), info.next_rate, std::move(promise));
} }
})); }));
} }
@ -10665,21 +10665,31 @@ void MessagesManager::on_get_recent_locations(DialogId dialog_id, int32 limit, i
void MessagesManager::on_get_message_public_forwards(int32 total_count, void MessagesManager::on_get_message_public_forwards(int32 total_count,
vector<tl_object_ptr<telegram_api::Message>> &&messages, vector<tl_object_ptr<telegram_api::Message>> &&messages,
int32 next_rate,
Promise<td_api::object_ptr<td_api::foundMessages>> &&promise) { Promise<td_api::object_ptr<td_api::foundMessages>> &&promise) {
TRY_STATUS_PROMISE(promise, G()->close_status()); TRY_STATUS_PROMISE(promise, G()->close_status());
LOG(INFO) << "Receive " << messages.size() << " forwarded messages"; LOG(INFO) << "Receive " << messages.size() << " forwarded messages";
vector<td_api::object_ptr<td_api::message>> result; vector<td_api::object_ptr<td_api::message>> result;
FullMessageId last_full_message_id; int32 last_message_date = 0;
MessageId last_message_id;
DialogId last_dialog_id;
for (auto &message : messages) { for (auto &message : messages) {
auto message_date = get_message_date(message);
auto message_id = MessageId::get_message_id(message, false);
auto dialog_id = DialogId::get_message_dialog_id(message); auto dialog_id = DialogId::get_message_dialog_id(message);
if (message_date > 0 && message_id.is_valid() && dialog_id.is_valid()) {
last_message_date = message_date;
last_message_id = message_id;
last_dialog_id = dialog_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, "get message public forwards"); false, false, false, "get message public forwards");
if (new_full_message_id != FullMessageId()) { if (new_full_message_id != FullMessageId()) {
CHECK(dialog_id == new_full_message_id.get_dialog_id()); CHECK(dialog_id == new_full_message_id.get_dialog_id());
result.push_back(get_message_object(new_full_message_id, "on_get_message_public_forwards")); result.push_back(get_message_object(new_full_message_id, "on_get_message_public_forwards"));
CHECK(result.back() != nullptr); CHECK(result.back() != nullptr);
last_full_message_id = new_full_message_id;
} else { } else {
total_count--; total_count--;
} }
@ -10691,10 +10701,11 @@ void MessagesManager::on_get_message_public_forwards(int32 total_count,
} }
string next_offset; string next_offset;
if (!result.empty()) { if (!result.empty()) {
auto m = get_message(last_full_message_id); if (next_rate > 0) {
CHECK(m != nullptr); last_message_date = next_rate;
next_offset = PSTRING() << m->date << "," << last_full_message_id.get_dialog_id().get() << "," }
<< m->message_id.get_server_message_id().get(); next_offset = PSTRING() << last_message_date << ',' << last_dialog_id.get() << ','
<< last_message_id.get_server_message_id().get();
} }
promise.set_value(td_api::make_object<td_api::foundMessages>(total_count, std::move(result), next_offset)); promise.set_value(td_api::make_object<td_api::foundMessages>(total_count, std::move(result), next_offset));

2
td/telegram/MessagesManager.h
View File

@ -232,7 +232,7 @@ class MessagesManager final : public Actor {
Promise<td_api::object_ptr<td_api::messages>> &&promise); Promise<td_api::object_ptr<td_api::messages>> &&promise);
void on_get_message_public_forwards(int32 total_count, vector<tl_object_ptr<telegram_api::Message>> &&messages, void on_get_message_public_forwards(int32 total_count, vector<tl_object_ptr<telegram_api::Message>> &&messages,
Promise<td_api::object_ptr<td_api::foundMessages>> &&promise); int32 next_rate, Promise<td_api::object_ptr<td_api::foundMessages>> &&promise);
// if message is from_update, flags have_previous and have_next are ignored and must be both true // if message is from_update, flags have_previous and have_next are ignored and must be both true
FullMessageId on_get_message(tl_object_ptr<telegram_api::Message> message_ptr, bool from_update, FullMessageId on_get_message(tl_object_ptr<telegram_api::Message> message_ptr, bool from_update,