Make custom text replaces work without replace emoji being enabled (#242)

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -503,9 +503,7 @@ void GroupInfoBox::prepare() {
 			: tr::lng_dlg_new_group_name)(),
 		_initialTitle);
 	_title->setMaxLength(Ui::EditPeer::kMaxGroupChannelTitle);
-	_title->setInstantReplaces(Ui::InstantReplaces::Default());
-	_title->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	_title->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	Ui::Emoji::SuggestionsController::Init(
 		getDelegate()->outerContainer(),
 		_title,
@@ -519,9 +517,7 @@ void GroupInfoBox::prepare() {
 			tr::lng_create_group_description());
 		_description->show();
 		_description->setMaxLength(Ui::EditPeer::kMaxChannelDescription);
-		_description->setInstantReplaces(Ui::InstantReplaces::Default());
-		_description->setInstantReplacesEnabled(
-			Core::App().settings().replaceEmojiValue());
+		_description->setInstantReplaces(Core::App().settings().instantReplacesValue());
 		_description->setSubmitSettings(
 			Core::App().settings().sendSubmitWay());
 

Telegram/SourceFiles/boxes/create_poll_box.cpp

@@ -162,9 +162,7 @@ void InitField(
 		not_null<QWidget*> container,
 		not_null<Ui::InputField*> field,
 		not_null<Main::Session*> session) {
-	field->setInstantReplaces(Ui::InstantReplaces::Default());
-	field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	field->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	auto options = Ui::Emoji::SuggestionsController::Options();
 	options.suggestExactFirstWord = false;
 	Ui::Emoji::SuggestionsController::Init(
@@ -842,9 +840,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 		st::createPollFieldPadding);
 	InitField(getDelegate()->outerContainer(), solution, session);
 	solution->setMaxLength(kSolutionLimit + kErrorLimit);
-	solution->setInstantReplaces(Ui::InstantReplaces::Default());
-	solution->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	solution->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	solution->setMarkdownReplacesEnabled(rpl::single(true));
 	solution->setEditLinkCallback(
 		DefaultEditLinkCallback(_controller, solution));

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -242,9 +242,7 @@ void EditCaptionBox::setupField() {
 		_controller->session().serverConfig().captionLengthMax);
 	_field->setSubmitSettings(
 		Core::App().settings().sendSubmitWay());
-	_field->setInstantReplaces(Ui::InstantReplaces::Default());
-	_field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	_field->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	_field->setMarkdownReplacesEnabled(rpl::single(true));
 	_field->setEditLinkCallback(
 		DefaultEditLinkCallback(_controller, _field));

Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp

@@ -627,9 +627,7 @@ void EditFilterBox(
 	if (!isLocal) {
 		name->setMaxLength(kMaxFilterTitleLength);
 	}
-	name->setInstantReplaces(Ui::InstantReplaces::Default());
-	name->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	name->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	Ui::Emoji::SuggestionsController::Init(
 		box->getDelegate()->outerContainer(),
 		name,

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -481,9 +481,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 			_peer->name),
 		st::editPeerTitleMargins);
 	result->entity()->setMaxLength(Ui::EditPeer::kMaxGroupChannelTitle);
-	result->entity()->setInstantReplaces(Ui::InstantReplaces::Default());
-	result->entity()->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	result->entity()->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	Ui::Emoji::SuggestionsController::Init(
 		_wrap->window(),
 		result->entity(),
@@ -515,9 +513,7 @@ object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
 			_peer->about()),
 		st::editPeerDescriptionMargins);
 	result->entity()->setMaxLength(Ui::EditPeer::kMaxChannelDescription);
-	result->entity()->setInstantReplaces(Ui::InstantReplaces::Default());
-	result->entity()->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	result->entity()->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	result->entity()->setSubmitSettings(Core::App().settings().sendSubmitWay());
 	Ui::Emoji::SuggestionsController::Init(
 		_wrap->window(),

Telegram/SourceFiles/boxes/send_files_box.cpp

@@ -706,9 +706,7 @@ void SendFilesBox::setupCaption() {
 		}
 		Unexpected("action in MimeData hook.");
 	});
-	_caption->setInstantReplaces(Ui::InstantReplaces::Default());
-	_caption->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	_caption->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	_caption->setMarkdownReplacesEnabled(rpl::single(true));
 	_caption->setEditLinkCallback(
 		DefaultEditLinkCallback(_controller, _caption));

Telegram/SourceFiles/boxes/share_box.cpp

@@ -221,9 +221,7 @@ void ShareBox::prepareCommentField() {
 		submit({});
 	});
 
-	field->setInstantReplaces(Ui::InstantReplaces::Default());
-	field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	field->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	field->setMarkdownReplacesEnabled(rpl::single(true));
 	if (_descriptor.initEditLink) {
 		_descriptor.initEditLink(field);

Telegram/SourceFiles/chat_helpers/message_field.cpp

@@ -142,9 +142,7 @@ void EditLinkBox::prepare() {
 			tr::lng_formatting_link_text(),
 			_startText),
 		st::markdownLinkFieldPadding);
-	text->setInstantReplaces(Ui::InstantReplaces::Default());
-	text->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	text->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	Ui::Emoji::SuggestionsController::Init(
 		getDelegate()->outerContainer(),
 		text,
@@ -306,9 +304,7 @@ void InitMessageField(
 	field->setAdditionalMargin(style::ConvertScale(4) - 4);
 
 	field->customTab(true);
-	field->setInstantReplaces(Ui::InstantReplaces::Default());
-	field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	field->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	field->setMarkdownReplacesEnabled(rpl::single(true));
 	field->setEditLinkCallback(DefaultEditLinkCallback(controller, field));
 }

Telegram/SourceFiles/core/core_settings.h

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "core/core_settings_proxy.h"
 #include "window/themes/window_themes_embedded.h"
+#include "ui/widgets/input_fields.h"
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "platform/platform_notifications_manager.h"
 #include "base/flags.h"
@@ -357,6 +358,9 @@ public:
 	}
 	void setReplaceEmoji(bool value) {
 		_replaceEmoji = value;
+		setInstantReplaces(value
+			? Ui::InstantReplaces::Default()
+			: Ui::InstantReplaces::Custom());
 	}
 	[[nodiscard]] bool replaceEmoji() const {
 		return _replaceEmoji.current();
@@ -367,6 +371,34 @@ public:
 	[[nodiscard]] rpl::producer<bool> replaceEmojiChanges() const {
 		return _replaceEmoji.changes();
 	}
+	void setInstantReplaces(Ui::InstantReplaces replaces) {
+		_instantReplaces = replaces;
+		_instantReplacesSet = true;
+	}
+	[[nodiscard]] Ui::InstantReplaces instantReplaces() {
+		if (!_instantReplacesSet) {
+			setInstantReplaces(replaceEmoji()
+				? Ui::InstantReplaces::Default()
+				: Ui::InstantReplaces::Custom());
+		}
+		return _instantReplaces.current();
+	}
+	[[nodiscard]] rpl::producer<Ui::InstantReplaces> instantReplacesValue() {
+		if (!_instantReplacesSet) {
+			setInstantReplaces(replaceEmoji()
+				? Ui::InstantReplaces::Default()
+				: Ui::InstantReplaces::Custom());
+		}
+		return _instantReplaces.value();
+	}
+	[[nodiscard]] rpl::producer<Ui::InstantReplaces> instantReplacesChanges() {
+		if (!_instantReplacesSet) {
+			setInstantReplaces(replaceEmoji()
+				? Ui::InstantReplaces::Default()
+				: Ui::InstantReplaces::Custom());
+		}
+		return _instantReplaces.changes();
+	}
 	[[nodiscard]] bool suggestEmoji() const {
 		return _suggestEmoji;
 	}
@@ -727,6 +759,8 @@ private:
 	bool _loopAnimatedStickers = true;
 	rpl::variable<bool> _largeEmoji = true;
 	rpl::variable<bool> _replaceEmoji = true;
+	rpl::variable<Ui::InstantReplaces> _instantReplaces;
+	bool _instantReplacesSet = false;
 	bool _suggestEmoji = true;
 	bool _suggestStickersByEmoji = true;
 	rpl::variable<bool> _spellcheckerEnabled = true;

Telegram/SourceFiles/settings/settings_information.cpp

@@ -363,9 +363,7 @@ void SetupBio(
 		save();
 	});
 	QObject::connect(bio, &Ui::InputField::changed, updated);
-	bio->setInstantReplaces(Ui::InstantReplaces::Default());
-	bio->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	bio->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	Ui::Emoji::SuggestionsController::Init(
 		container->window(),
 		bio,

Telegram/SourceFiles/support/support_helper.cpp

@@ -83,9 +83,7 @@ EditInfoBox::EditInfoBox(
 	_field->setMaxLength(kMaxSupportInfoLength);
 	_field->setSubmitSettings(
 		Core::App().settings().sendSubmitWay());
-	_field->setInstantReplaces(Ui::InstantReplaces::Default());
-	_field->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	_field->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	_field->setMarkdownReplacesEnabled(rpl::single(true));
 	_field->setEditLinkCallback(DefaultEditLinkCallback(controller, _field));
 }

Telegram/SourceFiles/window/notifications_manager_default.cpp

@@ -949,9 +949,7 @@ void Notification::showReplyField() {
 	_replyArea->setFocus();
 	_replyArea->setMaxLength(MaxMessageSize);
 	_replyArea->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
-	_replyArea->setInstantReplaces(Ui::InstantReplaces::Default());
-	_replyArea->setInstantReplacesEnabled(
-		Core::App().settings().replaceEmojiValue());
+	_replyArea->setInstantReplaces(Core::App().settings().instantReplacesValue());
 	_replyArea->setMarkdownReplacesEnabled(rpl::single(true));
 
 	// Catch mouse press event to activate the window.