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

Skip recently sent messages in find_unloadable_messages.

Browse Source
This commit is contained in:
levlam 2021-12-13 15:20:09 +03:00
parent ce3d9c2168
commit c510c4602c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
td/telegram/MessagesManager.cpp
View File

@ -10831,22 +10831,28 @@ void MessagesManager::find_newer_messages(const Message *m, MessageId min_messag
} }
void MessagesManager::find_unloadable_messages(const Dialog *d, int32 unload_before_date, const Message *m, void MessagesManager::find_unloadable_messages(const Dialog *d, int32 unload_before_date, const Message *m,
vector<MessageId> &message_ids, int32 &left_to_unload) const { vector<MessageId> &message_ids,
bool &has_left_to_unload_messages) const {
if (m == nullptr) { if (m == nullptr) {
return; return;
} }
find_unloadable_messages(d, unload_before_date, m->left.get(), message_ids, left_to_unload); find_unloadable_messages(d, unload_before_date, m->left.get(), message_ids, has_left_to_unload_messages);
if (can_unload_message(d, m)) { if (can_unload_message(d, m)) {
if (m->last_access_date <= unload_before_date) { if (m->last_access_date <= unload_before_date) {
message_ids.push_back(m->message_id); message_ids.push_back(m->message_id);
} else { } else {
left_to_unload++; has_left_to_unload_messages = true;
} }
} }
find_unloadable_messages(d, unload_before_date, m->right.get(), message_ids, left_to_unload); if (has_left_to_unload_messages && m->date > unload_before_date) {
// we aren't interested in unloading too new messages
return;
}
find_unloadable_messages(d, unload_before_date, m->right.get(), message_ids, has_left_to_unload_messages);
} }
void MessagesManager::delete_dialog_messages_by_sender(DialogId dialog_id, DialogId sender_dialog_id, void MessagesManager::delete_dialog_messages_by_sender(DialogId dialog_id, DialogId sender_dialog_id,
@ -11135,9 +11141,9 @@ void MessagesManager::unload_dialog(DialogId dialog_id) {
} }
vector<MessageId> to_unload_message_ids; vector<MessageId> to_unload_message_ids;
int32 left_to_unload = 0; bool has_left_to_unload_messages = false;
find_unloadable_messages(d, G()->unix_time_cached() - get_unload_dialog_delay() + 2, d->messages.get(), find_unloadable_messages(d, G()->unix_time_cached() - get_unload_dialog_delay() + 2, d->messages.get(),
to_unload_message_ids, left_to_unload); to_unload_message_ids, has_left_to_unload_messages);
vector<int64> unloaded_message_ids; vector<int64> unloaded_message_ids;
for (auto message_id : to_unload_message_ids) { for (auto message_id : to_unload_message_ids) {
@ -11155,8 +11161,8 @@ void MessagesManager::unload_dialog(DialogId dialog_id) {
make_tl_object<td_api::updateDeleteMessages>(dialog_id.get(), std::move(unloaded_message_ids), false, true)); make_tl_object<td_api::updateDeleteMessages>(dialog_id.get(), std::move(unloaded_message_ids), false, true));
} }
if (left_to_unload > 0) { if (has_left_to_unload_messages) {
LOG(DEBUG) << "Need to unload " << left_to_unload << " messages more in " << dialog_id; LOG(DEBUG) << "Need to unload more messages in " << dialog_id;
pending_unload_dialog_timeout_.add_timeout_in(d->dialog_id.get(), get_unload_dialog_delay()); pending_unload_dialog_timeout_.add_timeout_in(d->dialog_id.get(), get_unload_dialog_delay());
} else { } else {
d->has_unload_timeout = false; d->has_unload_timeout = false;

2
td/telegram/MessagesManager.h
View File

@ -2059,7 +2059,7 @@ class MessagesManager final : public Actor {
static void find_newer_messages(const Message *m, MessageId min_message_id, vector<MessageId> &message_ids); static void find_newer_messages(const Message *m, MessageId min_message_id, vector<MessageId> &message_ids);
void find_unloadable_messages(const Dialog *d, int32 unload_before_date, const Message *m, void find_unloadable_messages(const Dialog *d, int32 unload_before_date, const Message *m,
vector<MessageId> &message_ids, int32 &left_to_unload) const; vector<MessageId> &message_ids, bool &has_left_to_unload_messages) const;
void on_pending_message_views_timeout(DialogId dialog_id); void on_pending_message_views_timeout(DialogId dialog_id);