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

Fix notifications handling for bots.

Browse Source 
GitOrigin-RevId: aa80acf91ef74eb30e19aaadaf33b494f09236aa
This commit is contained in:
levlam 2019-12-30 03:39:49 +03:00
parent d810f11e2e
commit d327618102
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
td/telegram/NotificationManager.cpp
View File

@ -512,6 +512,9 @@ NotificationGroupId NotificationManager::get_next_notification_group_id() {
}
void NotificationManager::try_reuse_notification_group_id(NotificationGroupId group_id) {
if (is_disabled()) {
return;
}
if (!group_id.is_valid()) {
return;
}
@ -1933,25 +1936,37 @@ void NotificationManager::on_notification_group_size_max_changed() {
}
void NotificationManager::on_online_cloud_timeout_changed() {
if (is_disabled()) {
return;
}
online_cloud_timeout_ms_ =
G()->shared_config().get_option_integer("online_cloud_timeout_ms", DEFAULT_ONLINE_CLOUD_TIMEOUT_MS);
VLOG(notifications) << "Set online_cloud_timeout_ms to " << online_cloud_timeout_ms_;
}
void NotificationManager::on_notification_cloud_delay_changed() {
if (is_disabled()) {
return;
}
notification_cloud_delay_ms_ =
G()->shared_config().get_option_integer("notification_cloud_delay_ms", DEFAULT_ONLINE_CLOUD_DELAY_MS);
VLOG(notifications) << "Set notification_cloud_delay_ms to " << notification_cloud_delay_ms_;
}
void NotificationManager::on_notification_default_delay_changed() {
if (is_disabled()) {
return;
}
notification_default_delay_ms_ =
G()->shared_config().get_option_integer("notification_default_delay_ms", DEFAULT_DEFAULT_DELAY_MS);
VLOG(notifications) << "Set notification_default_delay_ms to " << notification_default_delay_ms_;
}
void NotificationManager::process_push_notification(string payload, Promise<Unit> &&promise) {
if (G()->close_flag()) {
if (is_disabled()) {
promise.set_value(Unit());
return;
}

8
td/telegram/Td.cpp
View File

@ -3803,9 +3803,13 @@ void Td::clear() {
send_update(make_tl_object<td_api::updateOption>(option.first, make_tl_object<td_api::optionValueEmpty>()));
}
}
notification_manager_->destroy_all_notifications();
if (!auth_manager_->is_bot()) {
notification_manager_->destroy_all_notifications();
}
} else {
notification_manager_->flush_all_notifications();
if (!auth_manager_->is_bot()) {
notification_manager_->flush_all_notifications();
}
}
LOG(DEBUG) << "Options was cleared " << timer;