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

Add schedule_dialog_unmute.

Browse Source 
GitOrigin-RevId: 05fd1e8bbfc08f5a27217085050b3a0ec14a191e
This commit is contained in:
levlam 2020-06-02 20:02:25 +03:00
parent d94afc648d
commit a0cb4aa260
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessagesManager.cpp
View File

@ -6758,6 +6758,15 @@ bool MessagesManager::update_scope_notification_settings(NotificationSettingsSco
return need_update_server; return need_update_server;
} }
void MessagesManager::schedule_dialog_unmute(DialogId dialog_id, bool use_default, int32 mute_until) {
auto now = G()->unix_time_cached();
if (!use_default && mute_until >= now && mute_until < now + 366 * 86400) {
dialog_unmute_timeout_.set_timeout_in(dialog_id.get(), mute_until - now + 1);
} else {
dialog_unmute_timeout_.cancel_timeout(dialog_id.get());
}
}
void MessagesManager::update_dialog_unmute_timeout(Dialog *d, bool old_use_default, int32 old_mute_until, void MessagesManager::update_dialog_unmute_timeout(Dialog *d, bool old_use_default, int32 old_mute_until,
bool new_use_default, int32 new_mute_until) { bool new_use_default, int32 new_mute_until) {
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {
@ -6770,12 +6779,7 @@ void MessagesManager::update_dialog_unmute_timeout(Dialog *d, bool old_use_defau
} }
CHECK(d != nullptr); CHECK(d != nullptr);
auto now = G()->unix_time_cached(); schedule_dialog_unmute(d->dialog_id, new_use_default, new_mute_until);
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);
} else {
dialog_unmute_timeout_.cancel_timeout(d->dialog_id.get());
}
if (old_mute_until != -1 && need_unread_counter(d->order)) { if (old_mute_until != -1 && need_unread_counter(d->order)) {
auto unread_count = d->server_unread_count + d->local_unread_count; auto unread_count = d->server_unread_count + d->local_unread_count;
@ -6918,7 +6922,7 @@ void MessagesManager::on_dialog_unmute(DialogId dialog_id) {
if (d->notification_settings.mute_until > now) { if (d->notification_settings.mute_until > now) {
LOG(ERROR) << "Failed to unmute " << dialog_id << " in " << now << ", will be unmuted in " LOG(ERROR) << "Failed to unmute " << dialog_id << " in " << now << ", will be unmuted in "
<< d->notification_settings.mute_until; << d->notification_settings.mute_until;
update_dialog_unmute_timeout(d, false, -1, false, d->notification_settings.mute_until); schedule_dialog_unmute(dialog_id, false, d->notification_settings.mute_until);
return; return;
} }
@ -29933,7 +29937,7 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
d->notification_settings.mute_until <= G()->unix_time()) { d->notification_settings.mute_until <= G()->unix_time()) {
d->notification_settings.mute_until = 0; d->notification_settings.mute_until = 0;
} else { } else {
update_dialog_unmute_timeout(d, false, -1, false, d->notification_settings.mute_until); schedule_dialog_unmute(dialog_id, false, d->notification_settings.mute_until);
} }
if (d->pinned_message_notification_message_id.is_valid()) { if (d->pinned_message_notification_message_id.is_valid()) {
auto pinned_message_id = d->pinned_message_notification_message_id; auto pinned_message_id = d->pinned_message_notification_message_id;

2
td/telegram/MessagesManager.h
View File

@ -2170,6 +2170,8 @@ class MessagesManager : public Actor {
bool update_scope_notification_settings(NotificationSettingsScope scope, ScopeNotificationSettings *current_settings, bool update_scope_notification_settings(NotificationSettingsScope scope, ScopeNotificationSettings *current_settings,
const ScopeNotificationSettings &new_settings); const ScopeNotificationSettings &new_settings);
void schedule_dialog_unmute(DialogId dialog_id, bool use_default, int32 mute_until);
void update_dialog_unmute_timeout(Dialog *d, bool old_use_default, int32 old_mute_until, bool new_use_default, void update_dialog_unmute_timeout(Dialog *d, bool old_use_default, int32 old_mute_until, bool new_use_default,
int32 new_mute_until); int32 new_mute_until);