Improve recipients selection in business features.

Telegram/Resources/langs/lang.strings

@@ -2285,6 +2285,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chatbots_remove" = "Remove Bot";
 "lng_chatbots_not_found" = "Chatbot not found.";
 "lng_chatbots_add" = "Add";
+"lng_chatbots_info_url" = "https://telegram.org/privacy";
 
 "lng_boost_channel_button" = "Boost Channel";
 "lng_boost_group_button" = "Boost Group";

Telegram/SourceFiles/core/local_url_handlers.cpp

@@ -669,17 +669,6 @@ bool ShowSearchTagsPromo(
 	return true;
 }
 
-bool ShowAboutBusinessChatbots(
-		Window::SessionController *controller,
-		const Match &match,
-		const QVariant &context) {
-	if (!controller) {
-		return false;
-	}
-	controller->showToast(u"Cool feature, yeah.."_q); AssertIsDebug();
-	return true;
-}
-
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -1048,10 +1037,6 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"about_tags"_q,
 			ShowSearchTagsPromo
 		},
-		{
-			u"about_business_chatbots"_q,
-			ShowAboutBusinessChatbots
-		},
 	};
 	return Result;
 }

Telegram/SourceFiles/data/business/data_business_common.h

@@ -30,6 +30,10 @@ struct BusinessChats {
 	BusinessChatTypes types;
 	std::vector<not_null<UserData*>> list;
 
+	[[nodiscard]] bool empty() const {
+		return !types && list.empty();
+	}
+
 	friend inline bool operator==(
 		const BusinessChats &a,
 		const BusinessChats &b) = default;
@@ -193,7 +197,7 @@ enum class AwayScheduleType : uchar {
 };
 
 struct AwaySchedule {
-	AwayScheduleType type = AwayScheduleType::Always;
+	AwayScheduleType type = AwayScheduleType::Never;
 	WorkingInterval customInterval;
 
 	friend inline bool operator==(

Telegram/SourceFiles/data/business/data_business_info.cpp

@@ -109,20 +109,20 @@ void BusinessInfo::saveAwaySettings(
 	const auto &was = _awaySettings;
 	if (was == data) {
 		return;
+	} else if (!data || data.shortcutId) {
+		using Flag = MTPaccount_UpdateBusinessAwayMessage::Flag;
+		const auto session = &_owner->session();
+		session->api().request(MTPaccount_UpdateBusinessAwayMessage(
+			MTP_flags(data ? Flag::f_message : Flag()),
+			data ? ToMTP(data) : MTPInputBusinessAwayMessage()
+		)).fail([=](const MTP::Error &error) {
+			_awaySettings = was;
+			_awaySettingsChanged.fire({});
+			if (fail) {
+				fail(error.type());
+			}
+		}).send();
 	}
-	using Flag = MTPaccount_UpdateBusinessAwayMessage::Flag;
-	const auto session = &_owner->session();
-	session->api().request(MTPaccount_UpdateBusinessAwayMessage(
-		MTP_flags(data ? Flag::f_message : Flag()),
-		data ? ToMTP(data) : MTPInputBusinessAwayMessage()
-	)).fail([=](const MTP::Error &error) {
-		_awaySettings = was;
-		_awaySettingsChanged.fire({});
-		if (fail) {
-			fail(error.type());
-		}
-	}).send();
-
 	_awaySettings = std::move(data);
 	_awaySettingsChanged.fire({});
 }
@@ -153,20 +153,20 @@ void BusinessInfo::saveGreetingSettings(
 	const auto &was = _greetingSettings;
 	if (was == data) {
 		return;
+	} else if (!data || data.shortcutId) {
+		using Flag = MTPaccount_UpdateBusinessGreetingMessage::Flag;
+		_owner->session().api().request(
+			MTPaccount_UpdateBusinessGreetingMessage(
+				MTP_flags(data ? Flag::f_message : Flag()),
+				data ? ToMTP(data) : MTPInputBusinessGreetingMessage())
+		).fail([=](const MTP::Error &error) {
+			_greetingSettings = was;
+			_greetingSettingsChanged.fire({});
+			if (fail) {
+				fail(error.type());
+			}
+		}).send();
 	}
-	using Flag = MTPaccount_UpdateBusinessGreetingMessage::Flag;
-	_owner->session().api().request(
-		MTPaccount_UpdateBusinessGreetingMessage(
-			MTP_flags(data ? Flag::f_message : Flag()),
-			data ? ToMTP(data) : MTPInputBusinessGreetingMessage())
-	).fail([=](const MTP::Error &error) {
-		_greetingSettings = was;
-		_greetingSettingsChanged.fire({});
-		if (fail) {
-			fail(error.type());
-		}
-	}).send();
-
 	_greetingSettings = std::move(data);
 	_greetingSettingsChanged.fire({});
 }

Telegram/SourceFiles/info/info_content_widget.h

@@ -101,6 +101,12 @@ public:
 	}
 	virtual void fillTopBarMenu(const Ui::Menu::MenuCallback &addAction);
 
+	[[nodiscard]] virtual bool closeByOutsideClick() const {
+		return true;
+	}
+	virtual void checkBeforeClose(Fn<void()> close) {
+		close();
+	}
 	[[nodiscard]] virtual rpl::producer<QString> title() = 0;
 	[[nodiscard]] virtual rpl::producer<QString> subtitle() {
 		return nullptr;

Telegram/SourceFiles/info/info_wrap_widget.cpp

@@ -410,8 +410,10 @@ void WrapWidget::setupTopBarMenuToggle() {
 }
 
 void WrapWidget::checkBeforeClose(Fn<void()> close) {
-	_controller->parentController()->hideLayer();
+	_content->checkBeforeClose(crl::guard(this, [=] {
-	close();
+		_controller->parentController()->hideLayer();
+		close();
+	}));
 }
 
 void WrapWidget::addTopBarMenuButton() {
@@ -438,7 +440,7 @@ void WrapWidget::addTopBarMenuButton() {
 }
 
 bool WrapWidget::closeByOutsideClick() const {
-	return true;
+	return _content->closeByOutsideClick();
 }
 
 void WrapWidget::addProfileCallsButton() {
@@ -872,8 +874,12 @@ void WrapWidget::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
 		if (hasStackHistory() || wrap() != Wrap::Layer) {
 			checkBeforeClose([=] { _controller->showBackFromStack(); });
-			return;
+		} else {
+			checkBeforeClose([=] {
+				_controller->parentController()->hideSpecialLayer();
+			});
 		}
+		return;
 	}
 	SectionWidget::keyPressEvent(e);
 }

Telegram/SourceFiles/info/settings/info_settings_widget.cpp

@@ -232,6 +232,14 @@ rpl::producer<bool> Widget::desiredShadowVisibility() const {
 		: rpl::single(true);
 }
 
+bool Widget::closeByOutsideClick() const {
+	return _inner->closeByOutsideClick();;
+}
+
+void Widget::checkBeforeClose(Fn<void()> close) {
+	_inner->checkBeforeClose(std::move(close));
+}
+
 rpl::producer<QString> Widget::title() {
 	return _inner->title();
 }

Telegram/SourceFiles/info/settings/info_settings_widget.h

@@ -76,6 +76,8 @@ public:
 
 	rpl::producer<bool> desiredShadowVisibility() const override;
 
+	bool closeByOutsideClick() const override;
+	void checkBeforeClose(Fn<void()> close) override;
 	rpl::producer<QString> title() override;
 
 	void enableBackButton() override;

Telegram/SourceFiles/settings/business/settings_away_message.cpp

@@ -38,6 +38,7 @@ public:
 		not_null<Window::SessionController*> controller);
 	~AwayMessage();
 
+	[[nodiscard]] bool closeByOutsideClick() const override;
 	[[nodiscard]] rpl::producer<QString> title() override;
 
 private:
@@ -199,6 +200,10 @@ AwayMessage::~AwayMessage() {
 	}
 }
 
+bool AwayMessage::closeByOutsideClick() const {
+	return false;
+}
+
 rpl::producer<QString> AwayMessage::title() {
 	return tr::lng_away_title();
 }

Telegram/SourceFiles/settings/business/settings_chatbots.cpp

@@ -53,6 +53,7 @@ public:
 		not_null<Window::SessionController*> controller);
 	~Chatbots();
 
+	[[nodiscard]] bool closeByOutsideClick() const override;
 	[[nodiscard]] rpl::producer<QString> title() override;
 
 	const Ui::RoundRect *bottomSkipRounding() const override {
@@ -380,6 +381,10 @@ Chatbots::~Chatbots() {
 	}
 }
 
+bool Chatbots::closeByOutsideClick() const {
+	return false;
+}
+
 rpl::producer<QString> Chatbots::title() {
 	return tr::lng_chatbots_title();
 }
@@ -402,7 +407,7 @@ void Chatbots::setupContent(
 		.about = tr::lng_chatbots_about(
 			lt_link,
 			tr::lng_chatbots_about_link(
-			) | Ui::Text::ToLink(u"internal:about_business_chatbots"_q),
+			) | Ui::Text::ToLink(tr::lng_chatbots_info_url(tr::now)),
 			Ui::Text::WithEntities),
 		.aboutMargins = st::peerAppearanceCoverLabelMargin,
 	});
@@ -485,7 +490,7 @@ void Chatbots::save() {
 		.recipients = _recipients.current(),
 		.repliesAllowed = _repliesAllowed.current(),
 	}, [=] {
-	}, [=](QString error) { show->showToast(error); });
+	}, fail);
 }
 
 } // namespace

Telegram/SourceFiles/settings/business/settings_greeting.cpp

@@ -42,6 +42,7 @@ public:
 		not_null<Window::SessionController*> controller);
 	~Greeting();
 
+	[[nodiscard]] bool closeByOutsideClick() const override;
 	[[nodiscard]] rpl::producer<QString> title() override;
 
 	const Ui::RoundRect *bottomSkipRounding() const override {
@@ -105,6 +106,10 @@ Greeting::~Greeting() {
 	}
 }
 
+bool Greeting::closeByOutsideClick() const {
+	return false;
+}
+
 rpl::producer<QString> Greeting::title() {
 	return tr::lng_greeting_title();
 }

Telegram/SourceFiles/settings/business/settings_recipients_helper.cpp

@@ -168,8 +168,10 @@ void AddBusinessRecipientsSelector(
 		modify(now);
 		*data = std::move(now);
 	};
+	const auto &current = data->current();
+	const auto all = current.allButExcluded || current.included.empty();
 	const auto group = std::make_shared<Ui::RadiobuttonGroup>(
-		data->current().allButExcluded ? kAllExcept : kSelectedOnly);
+		all ? kAllExcept : kSelectedOnly);
 	const auto everyone = container->add(
 		object_ptr<Ui::Radiobutton>(
 			container,
@@ -281,6 +283,12 @@ void AddBusinessRecipientsSelector(
 	}, lifetime);
 
 	SetupBusinessChatsPreview(includeInner, included);
+	included->value(
+	) | rpl::start_with_next([=](const Data::BusinessChats &value) {
+		if (value.empty() && group->current() == kSelectedOnly) {
+			group->setValue(kAllExcept);
+		}
+	}, lifetime);
 
 	includeWrap->toggleOn(data->value(
 	) | rpl::map([](const Data::BusinessRecipients &value) {
@@ -289,6 +297,20 @@ void AddBusinessRecipientsSelector(
 	includeWrap->finishAnimating();
 
 	group->setChangedCallback([=](int value) {
+		if (value == kSelectedOnly && data->current().included.empty()) {
+			group->setValue(kAllExcept);
+			const auto save = [=](Data::BusinessChats value) {
+				change([&](Data::BusinessRecipients &data) {
+					data.included = std::move(value);
+				});
+				group->setValue(kSelectedOnly);
+			};
+			EditBusinessChats(controller, {
+				.save = crl::guard(includeAdd, save),
+				.include = true,
+			});
+			return;
+		}
 		change([&](Data::BusinessRecipients &data) {
 			data.allButExcluded = (value == kAllExcept);
 		});

Telegram/SourceFiles/settings/business/settings_working_hours.cpp

@@ -44,6 +44,7 @@ public:
 		not_null<Window::SessionController*> controller);
 	~WorkingHours();
 
+	[[nodiscard]] bool closeByOutsideClick() const override;
 	[[nodiscard]] rpl::producer<QString> title() override;
 
 private:
@@ -529,6 +530,10 @@ WorkingHours::~WorkingHours() {
 	}
 }
 
+bool WorkingHours::closeByOutsideClick() const {
+	return false;
+}
+
 rpl::producer<QString> WorkingHours::title() {
 	return tr::lng_hours_title();
 }

Telegram/SourceFiles/settings/settings_common.h

@@ -70,6 +70,12 @@ public:
 	[[nodiscard]] virtual rpl::producer<std::vector<Type>> removeFromStack() {
 		return nullptr;
 	}
+	[[nodiscard]] virtual bool closeByOutsideClick() const {
+		return true;
+	}
+	virtual void checkBeforeClose(Fn<void()> close) {
+		close();
+	}
 	[[nodiscard]] virtual rpl::producer<QString> title() = 0;
 	virtual void sectionSaveChanges(FnMut<void()> done) {
 		done();