From 139d1a9aa369a377a52d24f9cde66fb509f30c61 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 1 Apr 2024 11:20:11 +0400 Subject: [PATCH] Allow saving just the sticker in custom intro. --- Telegram/SourceFiles/data/business/data_business_common.h | 6 +++++- .../SourceFiles/history/view/history_view_about_view.cpp | 4 ++-- .../SourceFiles/settings/business/settings_chat_intro.cpp | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/data/business/data_business_common.h b/Telegram/SourceFiles/data/business/data_business_common.h index dc9f65256..d6f4121a6 100644 --- a/Telegram/SourceFiles/data/business/data_business_common.h +++ b/Telegram/SourceFiles/data/business/data_business_common.h @@ -187,10 +187,14 @@ struct ChatIntro { QString description; DocumentData *sticker = nullptr; - explicit operator bool() const { + [[nodiscard]] bool customPhrases() const { return !title.isEmpty() || !description.isEmpty(); } + explicit operator bool() const { + return customPhrases() || sticker; + } + friend inline bool operator==( const ChatIntro &a, const ChatIntro &b) = default; diff --git a/Telegram/SourceFiles/history/view/history_view_about_view.cpp b/Telegram/SourceFiles/history/view/history_view_about_view.cpp index a748f962d..924035744 100644 --- a/Telegram/SourceFiles/history/view/history_view_about_view.cpp +++ b/Telegram/SourceFiles/history/view/history_view_about_view.cpp @@ -95,10 +95,10 @@ auto GenerateChatIntro( margins, links)); }; - const auto title = data + const auto title = data.customPhrases() ? data.title : tr::lng_chat_intro_default_title(tr::now); - const auto description = data + const auto description = data.customPhrases() ? data.description : tr::lng_chat_intro_default_message(tr::now); pushText(Ui::Text::Bold(title), st::chatIntroTitleMargin); diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp index 0be98f8fa..e7da8a27f 100644 --- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp +++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp @@ -649,9 +649,6 @@ void ChatIntro::setupContent( void ChatIntro::save() { const auto show = controller()->uiShow(); const auto fail = [=](QString error) { - if (error == u"BUSINESS_RECIPIENTS_EMPTY"_q) { - show->showToast(tr::lng_greeting_recipients_empty(tr::now)); - } }; controller()->session().data().businessInfo().saveChatIntro( _intro.current(),