From 4b146ee33a8a2d2ec40423615f33ba57da957334 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 12 Jun 2023 20:09:23 +0300 Subject: [PATCH] Add chatNotificationSettings.mute_stories/use_default_mute_stories. --- td/generate/scheme/td_api.tl | 4 ++- td/telegram/DialogNotificationSettings.cpp | 40 +++++++++++++++------- td/telegram/DialogNotificationSettings.h | 7 +++- td/telegram/DialogNotificationSettings.hpp | 7 ++++ td/telegram/MessagesManager.cpp | 3 +- td/telegram/cli.cpp | 6 ++-- 6 files changed, 48 insertions(+), 19 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index ef638fc3e..1b4b37ab0 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -1309,11 +1309,13 @@ notificationSettingsScopeChannelChats = NotificationSettingsScope; //@sound_id Identifier of the notification sound to be played; 0 if sound is disabled //@use_default_show_preview If true, show_preview is ignored and the value for the relevant type of chat or the forum chat is used instead //@show_preview True, if message content must be displayed in notifications +//@use_default_mute_stories If true, mute_stories is ignored and the value for the relevant type of chat is used instead +//@mute_stories True, if story notifications are received without sound //@use_default_disable_pinned_message_notifications If true, disable_pinned_message_notifications is ignored and the value for the relevant type of chat or the forum chat is used instead //@disable_pinned_message_notifications If true, notifications for incoming pinned messages will be created as for an ordinary unread message //@use_default_disable_mention_notifications If true, disable_mention_notifications is ignored and the value for the relevant type of chat or the forum chat is used instead //@disable_mention_notifications If true, notifications for messages with mentions will be created as for an ordinary unread message -chatNotificationSettings use_default_mute_for:Bool mute_for:int32 use_default_sound:Bool sound_id:int64 use_default_show_preview:Bool show_preview:Bool use_default_disable_pinned_message_notifications:Bool disable_pinned_message_notifications:Bool use_default_disable_mention_notifications:Bool disable_mention_notifications:Bool = ChatNotificationSettings; +chatNotificationSettings use_default_mute_for:Bool mute_for:int32 use_default_sound:Bool sound_id:int64 use_default_show_preview:Bool show_preview:Bool use_default_mute_stories:Bool mute_stories:Bool use_default_disable_pinned_message_notifications:Bool disable_pinned_message_notifications:Bool use_default_disable_mention_notifications:Bool disable_mention_notifications:Bool = ChatNotificationSettings; //@description Contains information about notification settings for several chats //@mute_for Time left before notifications will be unmuted, in seconds diff --git a/td/telegram/DialogNotificationSettings.cpp b/td/telegram/DialogNotificationSettings.cpp index 6acd3d053..a34b9d146 100644 --- a/td/telegram/DialogNotificationSettings.cpp +++ b/td/telegram/DialogNotificationSettings.cpp @@ -24,20 +24,26 @@ DialogNotificationSettings::get_input_peer_notify_settings() const { if (!use_default_show_preview) { flags |= telegram_api::inputPeerNotifySettings::SHOW_PREVIEWS_MASK; } + if (!use_default_mute_stories) { + flags |= telegram_api::inputPeerNotifySettings::STORIES_MUTED_MASK; + } if (silent_send_message) { flags |= telegram_api::inputPeerNotifySettings::SILENT_MASK; } return telegram_api::make_object( - flags, show_preview, silent_send_message, mute_until, get_input_notification_sound(sound), false, false, nullptr); + flags, show_preview, silent_send_message, mute_until, get_input_notification_sound(sound), mute_stories, false, + nullptr); } StringBuilder &operator<<(StringBuilder &string_builder, const DialogNotificationSettings ¬ification_settings) { return string_builder << "[" << notification_settings.mute_until << ", " << notification_settings.sound << ", " - << notification_settings.show_preview << ", " << notification_settings.silent_send_message - << ", " << notification_settings.disable_pinned_message_notifications << ", " + << notification_settings.show_preview << ", " << notification_settings.mute_stories << ", " + << notification_settings.silent_send_message << ", " + << notification_settings.disable_pinned_message_notifications << ", " << notification_settings.disable_mention_notifications << ", " << notification_settings.use_default_mute_until << ", " << notification_settings.use_default_show_preview << ", " + << notification_settings.use_default_mute_stories << ", " << notification_settings.use_default_disable_pinned_message_notifications << ", " << notification_settings.use_default_disable_mention_notifications << ", " << notification_settings.is_synchronized << "]"; @@ -50,7 +56,8 @@ td_api::object_ptr get_chat_notification_setti notification_settings->use_default_mute_until, max(0, notification_settings->mute_until - G()->unix_time()), is_notification_sound_default(notification_settings->sound), get_notification_sound_ringtone_id(notification_settings->sound), notification_settings->use_default_show_preview, - notification_settings->show_preview, notification_settings->use_default_disable_pinned_message_notifications, + notification_settings->show_preview, notification_settings->use_default_mute_stories, + notification_settings->mute_stories, notification_settings->use_default_disable_pinned_message_notifications, notification_settings->disable_pinned_message_notifications, notification_settings->use_default_disable_mention_notifications, notification_settings->disable_mention_notifications); @@ -85,13 +92,14 @@ Result get_dialog_notification_settings( if (is_notification_sound_default(old_settings->sound) && is_notification_sound_default(notification_sound)) { notification_sound = dup_notification_sound(old_settings->sound); } - return DialogNotificationSettings(notification_settings->use_default_mute_for_, mute_until, - std::move(notification_sound), notification_settings->use_default_show_preview_, - notification_settings->show_preview_, old_settings->silent_send_message, - notification_settings->use_default_disable_pinned_message_notifications_, - notification_settings->disable_pinned_message_notifications_, - notification_settings->use_default_disable_mention_notifications_, - notification_settings->disable_mention_notifications_); + return DialogNotificationSettings( + notification_settings->use_default_mute_for_, mute_until, std::move(notification_sound), + notification_settings->use_default_show_preview_, notification_settings->show_preview_, + notification_settings->use_default_mute_stories_, notification_settings->mute_stories_, + old_settings->silent_send_message, notification_settings->use_default_disable_pinned_message_notifications_, + notification_settings->disable_pinned_message_notifications_, + notification_settings->use_default_disable_mention_notifications_, + notification_settings->disable_mention_notifications_); } DialogNotificationSettings get_dialog_notification_settings(tl_object_ptr &&settings, @@ -119,6 +127,7 @@ DialogNotificationSettings get_dialog_notification_settings(tl_object_ptrflags_ & telegram_api::peerNotifySettings::MUTE_UNTIL_MASK) == 0; bool use_default_show_preview = (settings->flags_ & telegram_api::peerNotifySettings::SHOW_PREVIEWS_MASK) == 0; + bool use_default_mute_stories = (settings->flags_ & telegram_api::peerNotifySettings::STORIES_MUTED_MASK) == 0; auto mute_until = use_default_mute_until || settings->mute_until_ <= G()->unix_time() ? 0 : settings->mute_until_; bool silent_send_message = settings->silent_; return {use_default_mute_until, @@ -126,6 +135,8 @@ DialogNotificationSettings get_dialog_notification_settings(tl_object_ptrshow_previews_, + use_default_mute_stories, + settings->stories_muted_, silent_send_message, old_use_default_disable_pinned_message_notifications, old_disable_pinned_message_notifications, @@ -135,7 +146,8 @@ DialogNotificationSettings get_dialog_notification_settings(tl_object_ptrmute_until != new_settings.mute_until || !are_equivalent_notification_sounds(current_settings->sound, new_settings.sound) || current_settings->show_preview != new_settings.show_preview || + current_settings->mute_stories != new_settings.mute_stories || current_settings->use_default_mute_until != new_settings.use_default_mute_until || - current_settings->use_default_show_preview != new_settings.use_default_show_preview; + current_settings->use_default_show_preview != new_settings.use_default_show_preview || + current_settings->use_default_mute_stories != new_settings.use_default_mute_stories; result.need_update_local = current_settings->use_default_disable_pinned_message_notifications != new_settings.use_default_disable_pinned_message_notifications || diff --git a/td/telegram/DialogNotificationSettings.h b/td/telegram/DialogNotificationSettings.h index d949c9d44..e2d6d6da9 100644 --- a/td/telegram/DialogNotificationSettings.h +++ b/td/telegram/DialogNotificationSettings.h @@ -21,9 +21,11 @@ class DialogNotificationSettings { int32 mute_until = 0; unique_ptr sound; bool show_preview = true; + bool mute_stories = false; bool silent_send_message = false; bool use_default_mute_until = true; bool use_default_show_preview = true; + bool use_default_mute_stories = true; bool is_use_default_fixed = true; bool is_secret_chat_show_preview_fixed = false; bool is_synchronized = false; @@ -37,16 +39,19 @@ class DialogNotificationSettings { DialogNotificationSettings() = default; DialogNotificationSettings(bool use_default_mute_until, int32 mute_until, unique_ptr &&sound, - bool use_default_show_preview, bool show_preview, bool silent_send_message, + bool use_default_show_preview, bool show_preview, bool use_default_mute_stories, + bool mute_stories, bool silent_send_message, bool use_default_disable_pinned_message_notifications, bool disable_pinned_message_notifications, bool use_default_disable_mention_notifications, bool disable_mention_notifications) : mute_until(mute_until) , sound(std::move(sound)) , show_preview(show_preview) + , mute_stories(mute_stories) , silent_send_message(silent_send_message) , use_default_mute_until(use_default_mute_until) , use_default_show_preview(use_default_show_preview) + , use_default_mute_stories(use_default_mute_stories) , is_synchronized(true) , use_default_disable_pinned_message_notifications(use_default_disable_pinned_message_notifications) , disable_pinned_message_notifications(disable_pinned_message_notifications) diff --git a/td/telegram/DialogNotificationSettings.hpp b/td/telegram/DialogNotificationSettings.hpp index bd48b1457..722ac06ec 100644 --- a/td/telegram/DialogNotificationSettings.hpp +++ b/td/telegram/DialogNotificationSettings.hpp @@ -20,6 +20,7 @@ void store(const DialogNotificationSettings ¬ification_settings, StorerT &sto notification_settings.mute_until > G()->unix_time(); bool has_sound = notification_settings.sound != nullptr; bool has_ringtone_support = true; + bool use_mute_stories = !notification_settings.use_default_mute_stories; BEGIN_STORE_FLAGS(); STORE_FLAG(is_muted); STORE_FLAG(has_sound); @@ -36,6 +37,8 @@ void store(const DialogNotificationSettings ¬ification_settings, StorerT &sto STORE_FLAG(notification_settings.disable_mention_notifications); STORE_FLAG(notification_settings.is_secret_chat_show_preview_fixed); STORE_FLAG(has_ringtone_support); + STORE_FLAG(notification_settings.mute_stories); + STORE_FLAG(use_mute_stories); END_STORE_FLAGS(); if (is_muted) { store(notification_settings.mute_until, storer); @@ -53,6 +56,7 @@ void parse(DialogNotificationSettings ¬ification_settings, ParserT &parser) { bool use_disable_pinned_message_notifications; bool use_disable_mention_notifications; bool has_ringtone_support; + bool use_mute_stories; BEGIN_PARSE_FLAGS(); PARSE_FLAG(is_muted); PARSE_FLAG(has_sound); @@ -69,9 +73,12 @@ void parse(DialogNotificationSettings ¬ification_settings, ParserT &parser) { PARSE_FLAG(notification_settings.disable_mention_notifications); PARSE_FLAG(notification_settings.is_secret_chat_show_preview_fixed); PARSE_FLAG(has_ringtone_support); + PARSE_FLAG(notification_settings.mute_stories); + PARSE_FLAG(use_mute_stories); END_PARSE_FLAGS(); notification_settings.use_default_disable_pinned_message_notifications = !use_disable_pinned_message_notifications; notification_settings.use_default_disable_mention_notifications = !use_disable_mention_notifications; + notification_settings.use_default_mute_stories = !use_mute_stories; if (is_muted) { parse(notification_settings.mute_until, parser); } diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 402375ed6..8cc70808c 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -36375,7 +36375,8 @@ void MessagesManager::force_create_dialog(DialogId dialog_id, const char *source auto new_notification_settings = DialogNotificationSettings( user_settings->use_default_mute_until, user_settings->mute_until, dup_notification_sound(user_settings->sound), true /*use_default_show_preview*/, false /*show_preview*/, - user_settings->silent_send_message, true, false, true, false); + user_settings->use_default_mute_stories, user_settings->mute_stories, user_settings->silent_send_message, + true, false, true, false); new_notification_settings.is_secret_chat_show_preview_fixed = true; update_dialog_notification_settings(dialog_id, &d->notification_settings, std::move(new_notification_settings)); diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp index c6a75c750..e8875ea05 100644 --- a/td/telegram/cli.cpp +++ b/td/telegram/cli.cpp @@ -5501,9 +5501,9 @@ class CliClient final : public Actor { } else { auto settings = td_api::make_object( mute_for.empty(), to_integer(mute_for), sound_id == -1, sound_id, show_preview.empty(), - as_bool(show_preview), disable_pinned_message_notifications.empty(), - as_bool(disable_pinned_message_notifications), disable_mention_notifications.empty(), - as_bool(disable_mention_notifications)); + as_bool(show_preview), mute_stories.empty(), as_bool(mute_stories), + disable_pinned_message_notifications.empty(), as_bool(disable_pinned_message_notifications), + disable_mention_notifications.empty(), as_bool(disable_mention_notifications)); if (op == "scns") { send_request( td_api::make_object(as_chat_id(scope), std::move(settings)));