andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Remove dialog notifications when necessary.

Browse Source 
GitOrigin-RevId: d1d1b359d3703de41bd786fdfead9152628de9a6
This commit is contained in:
levlam 2018-11-20 20:17:15 +03:00
parent 53b02b38aa
commit 28da401d87
2 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
td/telegram/MessagesManager.cpp
View File

@ -5088,6 +5088,11 @@ bool MessagesManager::update_message_contains_unread_mention(Dialog *d, Message
LOG(INFO) << "Update unread mention message count in " << d->dialog_id << " to " << d->unread_mention_count LOG(INFO) << "Update unread mention message count in " << d->dialog_id << " to " << d->unread_mention_count
<< " by reading " << m->message_id << " from " << source; << " by reading " << m->message_id << " from " << source;
if (m->notification_id.is_valid() && d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification,
d->message_notification_group_id, m->notification_id, true, Promise<Unit>());
}
send_closure(G()->td(), &Td::send_update, send_closure(G()->td(), &Td::send_update,
make_tl_object<td_api::updateMessageMentionRead>(d->dialog_id.get(), m->message_id.get(), make_tl_object<td_api::updateMessageMentionRead>(d->dialog_id.get(), m->message_id.get(),
d->unread_mention_count)); d->unread_mention_count));
@ -5702,6 +5707,7 @@ void MessagesManager::update_dialog_unmute_timeout(Dialog *d, bool old_use_defau
auto now = G()->unix_time_cached(); auto now = G()->unix_time_cached();
if (!new_use_default && new_mute_until >= now && new_mute_until < now + 366 * 86400) { if (!new_use_default && new_mute_until >= now && new_mute_until < now + 366 * 86400) {
dialog_unmute_timeout_.set_timeout_in(d->dialog_id.get(), new_mute_until - now + 1); dialog_unmute_timeout_.set_timeout_in(d->dialog_id.get(), new_mute_until - now + 1);
remove_dialog_message_notifications(d);
} else { } else {
dialog_unmute_timeout_.cancel_timeout(d->dialog_id.get()); dialog_unmute_timeout_.cancel_timeout(d->dialog_id.get());
} }
@ -7733,7 +7739,7 @@ void MessagesManager::delete_all_dialog_messages(Dialog *d, bool remove_from_dia
vector<int64> deleted_message_ids; vector<int64> deleted_message_ids;
do_delete_all_dialog_messages(d, d->messages, deleted_message_ids); do_delete_all_dialog_messages(d, d->messages, deleted_message_ids);
delete_all_dialog_messages_from_database(d->dialog_id, MessageId::max(), "delete_all_dialog_messages"); delete_all_dialog_messages_from_database(d, MessageId::max(), "delete_all_dialog_messages");
if (is_permanent) { if (is_permanent) {
for (auto id : deleted_message_ids) { for (auto id : deleted_message_ids) {
d->deleted_message_ids.insert(MessageId{id}); d->deleted_message_ids.insert(MessageId{id});
@ -7821,6 +7827,10 @@ void MessagesManager::read_all_dialog_mentions(DialogId dialog_id, Promise<Unit>
CHECK(m->message_id == message_id); CHECK(m->message_id == message_id);
m->contains_unread_mention = false; m->contains_unread_mention = false;
if (m->notification_id.is_valid() && d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification,
d->message_notification_group_id, m->notification_id, true, Promise<Unit>());
}
send_closure(G()->td(), &Td::send_update, send_closure(G()->td(), &Td::send_update,
make_tl_object<td_api::updateMessageMentionRead>(dialog_id.get(), m->message_id.get(), 0)); make_tl_object<td_api::updateMessageMentionRead>(dialog_id.get(), m->message_id.get(), 0));
is_update_sent = true; is_update_sent = true;
@ -8217,12 +8227,6 @@ void MessagesManager::set_dialog_last_read_inbox_message_id(Dialog *d, MessageId
if (message_id != MessageId::min()) { if (message_id != MessageId::min()) {
d->last_read_inbox_message_id = message_id; d->last_read_inbox_message_id = message_id;
d->is_last_read_inbox_message_id_inited = true; d->is_last_read_inbox_message_id_inited = true;
if (d->last_read_inbox_message_id.is_valid() && d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification_group,
d->message_notification_group_id, NotificationId(), d->last_read_inbox_message_id,
get_dialog_pending_notification_count(d), Promise<Unit>());
}
} }
int32 old_unread_count = d->server_unread_count + d->local_unread_count; int32 old_unread_count = d->server_unread_count + d->local_unread_count;
d->server_unread_count = server_unread_count; d->server_unread_count = server_unread_count;
@ -8252,6 +8256,14 @@ void MessagesManager::set_dialog_last_read_inbox_message_id(Dialog *d, MessageId
} }
send_update_unread_chat_count(d->dialog_id, force_update, source); send_update_unread_chat_count(d->dialog_id, force_update, source);
} }
if (message_id != MessageId::min()) {
if (d->last_read_inbox_message_id.is_valid() && d->message_notification_group_id.is_valid() &&
d->order != DEFAULT_ORDER && d->order != SPONSORED_DIALOG_ORDER) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification_group,
d->message_notification_group_id, NotificationId(), d->last_read_inbox_message_id,
get_dialog_pending_notification_count(d), Promise<Unit>());
}
}
send_update_chat_read_inbox(d, force_update, source); send_update_chat_read_inbox(d, force_update, source);
} }
@ -9639,7 +9651,7 @@ void MessagesManager::set_dialog_last_new_message_id(Dialog *d, MessageId last_n
<< last_new_message_id << " " << d->last_new_message_id << " " << source; << last_new_message_id << " " << d->last_new_message_id << " " << source;
CHECK(d->dialog_id.get_type() == DialogType::SecretChat || last_new_message_id.is_server()); CHECK(d->dialog_id.get_type() == DialogType::SecretChat || last_new_message_id.is_server());
if (!d->last_new_message_id.is_valid()) { if (!d->last_new_message_id.is_valid()) {
delete_all_dialog_messages_from_database(d->dialog_id, MessageId::max(), "set_dialog_last_new_message_id"); delete_all_dialog_messages_from_database(d, MessageId::max(), "set_dialog_last_new_message_id");
set_dialog_first_database_message_id(d, MessageId(), "set_dialog_last_new_message_id"); set_dialog_first_database_message_id(d, MessageId(), "set_dialog_last_new_message_id");
set_dialog_last_database_message_id(d, MessageId(), source); set_dialog_last_database_message_id(d, MessageId(), source);
if (d->dialog_id.get_type() != DialogType::SecretChat) { if (d->dialog_id.get_type() != DialogType::SecretChat) {
@ -17510,6 +17522,14 @@ void MessagesManager::flush_pending_new_message_notifications(DialogId dialog_id
} }
} }
void MessagesManager::remove_dialog_message_notifications(const Dialog *d) const {
if (d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification_group,
d->message_notification_group_id, td_->notification_manager_->get_max_notification_id(),
MessageId(), 0, Promise<Unit>());
}
}
void MessagesManager::send_update_message_send_succeeded(Dialog *d, MessageId old_message_id, const Message *m) const { void MessagesManager::send_update_message_send_succeeded(Dialog *d, MessageId old_message_id, const Message *m) const {
CHECK(m != nullptr); CHECK(m != nullptr);
d->yet_unsent_message_id_to_persistent_message_id.emplace(old_message_id, m->message_id); d->yet_unsent_message_id_to_persistent_message_id.emplace(old_message_id, m->message_id);
@ -20502,13 +20522,19 @@ void MessagesManager::add_message_to_database(const Dialog *d, const Message *m,
search_id, text, log_event_store(*m), Auto()); // TODO Promise search_id, text, log_event_store(*m), Auto()); // TODO Promise
} }
void MessagesManager::delete_all_dialog_messages_from_database(DialogId dialog_id, MessageId message_id, void MessagesManager::delete_all_dialog_messages_from_database(const Dialog *d, MessageId message_id,
const char *source) { const char *source) {
CHECK(d != nullptr);
if (d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification_group,
d->message_notification_group_id, NotificationId(), message_id, 0, Promise<Unit>());
}
if (!G()->parameters().use_message_db) { if (!G()->parameters().use_message_db) {
return; return;
} }
CHECK(dialog_id.is_valid()); auto dialog_id = d->dialog_id;
if (!message_id.is_valid()) { if (!message_id.is_valid()) {
return; return;
} }
@ -20588,6 +20614,11 @@ void MessagesManager::delete_message_from_database(Dialog *d, MessageId message_
return; return;
} }
if (m != nullptr && m->notification_id.is_valid() && d->message_notification_group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification,
d->message_notification_group_id, m->notification_id, true, Promise<Unit>());
}
auto is_secret = d->dialog_id.get_type() == DialogType::SecretChat; auto is_secret = d->dialog_id.get_type() == DialogType::SecretChat;
if (m != nullptr && m->ttl > 0) { if (m != nullptr && m->ttl > 0) {
delete_message_files(m); delete_message_files(m);
@ -20805,6 +20836,8 @@ void MessagesManager::update_message(Dialog *d, unique_ptr<Message> &old_message
LOG_IF(ERROR, old_message->edit_date == 0) LOG_IF(ERROR, old_message->edit_date == 0)
<< message_id << " in " << dialog_id << " has changed contains_mention from " << old_message->contains_mention << message_id << " in " << dialog_id << " has changed contains_mention from " << old_message->contains_mention
<< " to " << new_message->contains_mention; << " to " << new_message->contains_mention;
// contains_mention flag shouldn't be changed, because the message will not be added to unread mention list
// and we are unable to show/hide message notification
// old_message->contains_mention = new_message->contains_mention; // old_message->contains_mention = new_message->contains_mention;
// is_changed = true; // is_changed = true;
} }
@ -20814,6 +20847,7 @@ void MessagesManager::update_message(Dialog *d, unique_ptr<Message> &old_message
<< new_message->disable_notification << new_message->disable_notification
<< ". Old message: " << to_string(get_message_object(dialog_id, old_message.get())) << ". Old message: " << to_string(get_message_object(dialog_id, old_message.get()))
<< ". New message: " << to_string(get_message_object(dialog_id, new_message.get())); << ". New message: " << to_string(get_message_object(dialog_id, new_message.get()));
// disable_notification flag shouldn't be changed, because we are unable to show/hide message notification
// old_message->disable_notification = new_message->disable_notification; // old_message->disable_notification = new_message->disable_notification;
// is_changed = true; // is_changed = true;
} }
@ -21664,6 +21698,9 @@ bool MessagesManager::set_dialog_order(Dialog *d, int64 new_order, bool need_sen
repair_channel_server_unread_count(d); repair_channel_server_unread_count(d);
channel_get_difference_retry_timeout_.add_timeout_in(dialog_id.get(), 0.001); channel_get_difference_retry_timeout_.add_timeout_in(dialog_id.get(), 0.001);
} }
if (dialog_id.get_type() == DialogType::Channel && !has_unread_counter) {
remove_dialog_message_notifications(d);
}
} }
d->order = new_order; d->order = new_order;
@ -22069,7 +22106,6 @@ void MessagesManager::on_get_channel_dialog(DialogId dialog_id, MessageId last_m
// searchChatMessages. The messages should still be lazily checked using getHistory, but they are still available // searchChatMessages. The messages should still be lazily checked using getHistory, but they are still available
// offline. It is the best way for gaps support, but it is pretty hard to implement correctly. // offline. It is the best way for gaps support, but it is pretty hard to implement correctly.
// It should be also noted that some messages like live location messages shouldn't be deleted. // It should be also noted that some messages like live location messages shouldn't be deleted.
// delete_all_dialog_messages_from_database(dialog_id, d->last_database_message_id, "on_get_channel_dialog");
set_dialog_first_database_message_id(d, MessageId(), "on_get_channel_dialog"); set_dialog_first_database_message_id(d, MessageId(), "on_get_channel_dialog");
set_dialog_last_database_message_id(d, MessageId(), "on_get_channel_dialog"); set_dialog_last_database_message_id(d, MessageId(), "on_get_channel_dialog");

4
td/telegram/MessagesManager.h
View File

@ -1426,7 +1426,7 @@ class MessagesManager : public Actor {
void add_message_to_database(const Dialog *d, const Message *m, const char *source); void add_message_to_database(const Dialog *d, const Message *m, const char *source);
void delete_all_dialog_messages_from_database(DialogId dialog_id, MessageId message_id, const char *source); void delete_all_dialog_messages_from_database(const Dialog *d, MessageId message_id, const char *source);
void delete_message_from_database(Dialog *d, MessageId message_id, const Message *m, void delete_message_from_database(Dialog *d, MessageId message_id, const Message *m,
bool is_permanently_deleted) const; bool is_permanently_deleted) const;
@ -1461,6 +1461,8 @@ class MessagesManager : public Actor {
void flush_pending_new_message_notifications(DialogId dialog_id); void flush_pending_new_message_notifications(DialogId dialog_id);
void remove_dialog_message_notifications(const Dialog *d) const;
void send_update_message_send_succeeded(Dialog *d, MessageId old_message_id, const Message *m) const; void send_update_message_send_succeeded(Dialog *d, MessageId old_message_id, const Message *m) const;
void send_update_message_content(DialogId dialog_id, MessageId message_id, const MessageContent *content, void send_update_message_content(DialogId dialog_id, MessageId message_id, const MessageContent *content,