diff --git a/td/telegram/NotificationSettings.cpp b/td/telegram/NotificationSettings.cpp index 000cb1e64..bfaa1164a 100644 --- a/td/telegram/NotificationSettings.cpp +++ b/td/telegram/NotificationSettings.cpp @@ -115,6 +115,18 @@ NotificationSettingsScope get_notification_settings_scope( } } +static int32 get_mute_until(int32 mute_for) { + if (mute_for <= 0) { + return 0; + } + + int32 current_time = G()->unix_time(); + if (mute_for >= std::numeric_limits::max() - current_time) { + return std::numeric_limits::max(); + } + return mute_for + current_time; +} + Result get_dialog_notification_settings( td_api::object_ptr &¬ification_settings, bool old_silent_send_message) { if (notification_settings == nullptr) { @@ -127,18 +139,8 @@ Result get_dialog_notification_settings( notification_settings->sound_ = "default"; } - int32 current_time = G()->unix_time(); - if (notification_settings->mute_for_ > std::numeric_limits::max() - current_time) { - notification_settings->mute_for_ = std::numeric_limits::max() - current_time; - } - - int32 mute_until; - if (notification_settings->use_default_mute_for_ || notification_settings->mute_for_ <= 0) { - mute_until = 0; - } else { - mute_until = notification_settings->mute_for_ + current_time; - } - + int32 mute_until = + notification_settings->use_default_mute_for_ ? 0 : get_mute_until(notification_settings->mute_for_); return DialogNotificationSettings(notification_settings->use_default_mute_for_, mute_until, notification_settings->use_default_sound_, std::move(notification_settings->sound_), notification_settings->use_default_show_preview_, @@ -161,18 +163,7 @@ Result get_scope_notification_settings( notification_settings->sound_ = "default"; } - int32 current_time = G()->unix_time(); - if (notification_settings->mute_for_ > std::numeric_limits::max() - current_time) { - notification_settings->mute_for_ = std::numeric_limits::max() - current_time; - } - - int32 mute_until; - if (notification_settings->mute_for_ <= 0) { - mute_until = 0; - } else { - mute_until = notification_settings->mute_for_ + current_time; - } - + auto mute_until = get_mute_until(notification_settings->mute_for_); return ScopeNotificationSettings(mute_until, std::move(notification_settings->sound_), notification_settings->show_preview_, notification_settings->disable_pinned_message_notifications_,