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

Add MessagesManager::have_dialog_scheduled_messages_in_memory helper.

Browse Source
This commit is contained in:
levlam 2023-05-01 23:15:54 +03:00
parent 5397fe43e0
commit 713b1f086e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessagesManager.cpp
View File

@ -6550,6 +6550,10 @@ tl_object_ptr<telegram_api::inputEncryptedChat> MessagesManager::get_input_encry
} }
} }
bool MessagesManager::have_dialog_scheduled_messages_in_memory(const Dialog *d) {
return d->scheduled_messages != nullptr && d->scheduled_messages->scheduled_messages_ != nullptr;
}
bool MessagesManager::is_allowed_useless_update(const tl_object_ptr<telegram_api::Update> &update) { bool MessagesManager::is_allowed_useless_update(const tl_object_ptr<telegram_api::Update> &update) {
auto constructor_id = update->get_id(); auto constructor_id = update->get_id();
if (constructor_id == dummyUpdate::ID) { if (constructor_id == dummyUpdate::ID) {
@ -30889,7 +30893,7 @@ void MessagesManager::send_update_chat_has_scheduled_messages(Dialog *d, bool fr
return; return;
} }
if (d->scheduled_messages == nullptr || d->scheduled_messages->scheduled_messages_ == nullptr) { if (!have_dialog_scheduled_messages_in_memory(d)) {
if (d->has_scheduled_database_messages) { if (d->has_scheduled_database_messages) {
if (d->has_loaded_scheduled_messages_from_database) { if (d->has_loaded_scheduled_messages_from_database) {
set_dialog_has_scheduled_database_messages_impl(d, false); set_dialog_has_scheduled_database_messages_impl(d, false);
@ -30909,8 +30913,8 @@ void MessagesManager::send_update_chat_has_scheduled_messages(Dialog *d, bool fr
} }
LOG(INFO) << "In " << d->dialog_id << " have scheduled messages on server = " << d->has_scheduled_server_messages LOG(INFO) << "In " << d->dialog_id << " have scheduled messages on server = " << d->has_scheduled_server_messages
<< ", in database = " << d->has_scheduled_database_messages << " and in memory = " << ", in database = " << d->has_scheduled_database_messages
<< (d->scheduled_messages != nullptr && d->scheduled_messages->scheduled_messages_ != nullptr) << " and in memory = " << have_dialog_scheduled_messages_in_memory(d)
<< "; was loaded from database = " << d->has_loaded_scheduled_messages_from_database; << "; was loaded from database = " << d->has_loaded_scheduled_messages_from_database;
bool has_scheduled_messages = get_dialog_has_scheduled_messages(d); bool has_scheduled_messages = get_dialog_has_scheduled_messages(d);
if (has_scheduled_messages == d->last_sent_has_scheduled_messages) { if (has_scheduled_messages == d->last_sent_has_scheduled_messages) {
@ -32178,8 +32182,7 @@ void MessagesManager::on_update_dialog_has_scheduled_server_messages(DialogId di
if (d->has_scheduled_server_messages != has_scheduled_server_messages) { if (d->has_scheduled_server_messages != has_scheduled_server_messages) {
set_dialog_has_scheduled_server_messages(d, has_scheduled_server_messages); set_dialog_has_scheduled_server_messages(d, has_scheduled_server_messages);
} else if (has_scheduled_server_messages != } else if (has_scheduled_server_messages !=
(d->has_scheduled_database_messages || (d->has_scheduled_database_messages || have_dialog_scheduled_messages_in_memory(d))) {
(d->scheduled_messages != nullptr && d->scheduled_messages->scheduled_messages_ != nullptr))) {
repair_dialog_scheduled_messages(d); repair_dialog_scheduled_messages(d);
} }
} }
@ -32210,8 +32213,7 @@ void MessagesManager::set_dialog_has_scheduled_database_messages_impl(Dialog *d,
return; return;
} }
if (d->has_scheduled_database_messages && d->scheduled_messages != nullptr && if (d->has_scheduled_database_messages && have_dialog_scheduled_messages_in_memory(d) &&
d->scheduled_messages->scheduled_messages_ != nullptr &&
!d->scheduled_messages->scheduled_messages_->message_id.is_yet_unsent()) { !d->scheduled_messages->scheduled_messages_->message_id.is_yet_unsent()) {
// to prevent race between add_message_to_database and check of has_scheduled_database_messages // to prevent race between add_message_to_database and check of has_scheduled_database_messages
return; return;
@ -33058,7 +33060,7 @@ bool MessagesManager::get_dialog_has_scheduled_messages(const Dialog *d) const {
// TODO send updateChatHasScheduledMessage when can_post_messages changes // TODO send updateChatHasScheduledMessage when can_post_messages changes
return d->has_scheduled_server_messages || d->has_scheduled_database_messages || return d->has_scheduled_server_messages || d->has_scheduled_database_messages ||
(d->scheduled_messages != nullptr && d->scheduled_messages->scheduled_messages_ != nullptr); have_dialog_scheduled_messages_in_memory(d);
} }
MessagesManager::DialogScheduledMessages *MessagesManager::add_dialog_scheduled_messages(Dialog *d) { MessagesManager::DialogScheduledMessages *MessagesManager::add_dialog_scheduled_messages(Dialog *d) {
@ -35500,7 +35502,7 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo
Message *result_message = treap_insert_message(&scheduled_messages->scheduled_messages_, std::move(message)); Message *result_message = treap_insert_message(&scheduled_messages->scheduled_messages_, std::move(message));
CHECK(result_message != nullptr); CHECK(result_message != nullptr);
CHECK(scheduled_messages->scheduled_messages_ != nullptr); CHECK(have_dialog_scheduled_messages_in_memory(d));
being_readded_message_id_ = FullMessageId(); being_readded_message_id_ = FullMessageId();
return result_message; return result_message;
} }

2
td/telegram/MessagesManager.h
View File

@ -2347,6 +2347,8 @@ class MessagesManager final : public Actor {
static void set_message_id(unique_ptr<Message> &message, MessageId message_id); static void set_message_id(unique_ptr<Message> &message, MessageId message_id);
static bool have_dialog_scheduled_messages_in_memory(const Dialog *d);
static bool is_allowed_useless_update(const tl_object_ptr<telegram_api::Update> &update); static bool is_allowed_useless_update(const tl_object_ptr<telegram_api::Update> &update);
bool is_message_auto_read(DialogId dialog_id, bool is_outgoing) const; bool is_message_auto_read(DialogId dialog_id, bool is_outgoing) const;