Use rpl::empty instead of rpl::empty_value().

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -309,7 +309,7 @@ void EditCaptionBox::setupShadows() {
 
 void EditCaptionBox::setupControls() {
 	auto hintLabelToggleOn = _previewRebuilds.events_starting_with(
-		rpl::empty_value()
+		{}
 	) | rpl::map([=] {
 		return _controller->session().settings().photoEditorHintShown()
 			? _isPhoto
@@ -334,9 +334,7 @@ void EditCaptionBox::setupControls() {
 			st::defaultBoxCheckbox),
 		st::editMediaCheckboxMargins)
 	)->toggleOn(
-		_previewRebuilds.events_starting_with(
+		_previewRebuilds.events_starting_with({}) | rpl::map([=] {
-			rpl::empty_value()
-		) | rpl::map([=] {
 			return _isPhoto
 				&& CanBeCompressed(_albumType)
 				&& !_preparedList.files.empty();

Telegram/SourceFiles/boxes/edit_privacy_box.cpp

@@ -269,9 +269,7 @@ void EditPrivacyBox::setupContent() {
 	};
 	const auto addExceptionLink = [=](Exception exception) {
 		const auto update = Ui::CreateChild<rpl::event_stream<>>(content);
-		auto label = update->events_starting_with(
+		auto label = update->events_starting_with({}) | rpl::map([=] {
-			rpl::empty_value()
-		) | rpl::map([=] {
 			return Settings::ExceptionUsersCount(exceptions(exception));
 		}) | rpl::map([](int count) {
 			return count

Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp

@@ -237,7 +237,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 		QImage::Format_ARGB32_Premultiplied);
 	background->setDevicePixelRatio(cRetinaFactor());
 	rpl::merge(
-		rpl::single(rpl::empty_value()),
+		rpl::single(rpl::empty),
 		Ui::Emoji::Updated(),
 		style::PaletteChanged()
 	) | rpl::start_with_next([=] {

Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp

@@ -165,9 +165,9 @@ void ScheduleGroupCallBox(
 
 	using namespace rpl::mappers;
 	*duration = rpl::combine(
-		rpl::single(
+		rpl::single(rpl::empty) | rpl::then(
-			rpl::empty_value()
+			base::timer_each(kLabelRefreshInterval)
-		) | rpl::then(base::timer_each(kLabelRefreshInterval)),
+		),
 		std::move(descriptor.values) | rpl::filter(_1 != 0),
 		_2
 	) | rpl::map([](TimeId date) {

Telegram/SourceFiles/calls/group/calls_group_panel.cpp

@@ -728,7 +728,7 @@ void Panel::setupScheduledLabels(rpl::producer<TimeId> date) {
 		date
 	) | rpl::map([=](TimeId date) {
 		_countdownData = std::make_shared<Ui::GroupCallScheduledLeft>(date);
-		return rpl::empty_value();
+		return rpl::empty;
 	}) | rpl::start_spawning(lifetime());
 
 	_countdown = Ui::CreateGradientLabel(widget(), rpl::duplicate(
@@ -1742,9 +1742,7 @@ void Panel::setupControlsBackgroundNarrow() {
 	const auto full = lifetime.make_state<QImage>(
 		QSize(1, height * factor),
 		QImage::Format_ARGB32_Premultiplied);
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		style::PaletteChanged()
 	) | rpl::start_with_next([=] {
 		full->fill(Qt::transparent);

Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp

@@ -364,9 +364,7 @@ void Row::setupContent(const Set &set) {
 	) | rpl::map([=](Loader *loader) {
 		return (loader && loader->id() == _id)
 			? loader->state()
-			: rpl::single(
+			: rpl::single(rpl::empty) | rpl::then(
-				rpl::empty_value()
-			) | rpl::then(
 				Updated()
 			) | rpl::map([=] {
 				return ComputeState(_id);

Telegram/SourceFiles/data/data_shared_media.cpp

@@ -211,9 +211,7 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 
 	const auto history = session->data().history(key.mergedKey.peerId);
 
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		session->data().scheduledMessages().updates(history)
 	) | rpl::map([=] {
 		const auto list = session->data().scheduledMessages().list(history);

Telegram/SourceFiles/dialogs/dialogs_widget.cpp

@@ -286,7 +286,7 @@ Widget::Widget(
 	if (!Core::UpdaterDisabled()) {
 		Core::UpdateChecker checker;
 		rpl::merge(
-			rpl::single(rpl::empty_value()),
+			rpl::single(rpl::empty),
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()
@@ -303,9 +303,7 @@ Widget::Widget(
 	_cancelSearch->setClickedCallback([this] { onCancelSearch(); });
 	_jumpToDate->entity()->setClickedCallback([this] { showCalendar(); });
 	_chooseFromUser->entity()->setClickedCallback([this] { showSearchFrom(); });
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		session().domain().local().localPasscodeChanged()
 	) | rpl::start_with_next([=] {
 		updateLockUnlockVisibility();
@@ -519,9 +517,7 @@ void Widget::setupSupportMode() {
 void Widget::setupMainMenuToggle() {
 	_mainMenuToggle->setClickedCallback([=] { showMainMenu(); });
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		controller()->filtersMenuChanged()
 	) | rpl::start_with_next([=] {
 		const auto filtersHidden = !controller()->filtersWidth();

Telegram/SourceFiles/editor/photo_editor_controls.cpp

@@ -352,9 +352,9 @@ PhotoEditorControls::PhotoEditorControls(
 		}, _stickersButton->lifetime());
 	}
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::skip(
-		rpl::empty_value()
+		modifications.flipped ? 0 : 1
-	) | rpl::skip(modifications.flipped ? 0 : 1) | rpl::then(
+	) | rpl::then(
 		_flipButton->clicks() | rpl::to_empty
 	) | rpl::start_with_next([=] {
 		_flipped = !_flipped;

Telegram/SourceFiles/history/view/history_view_react_button.cpp

@@ -1600,9 +1600,7 @@ void SetupManagerList(
 		not_null<Main::Session*> session,
 		rpl::producer<std::optional<base::flat_set<QString>>> filter) {
 	const auto reactions = &session->data().reactions();
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		reactions->updates()
 	) | rpl::start_with_next([=] {
 		manager->applyList(

Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp

@@ -1096,9 +1096,7 @@ rpl::producer<Data::MessagesSlice> ScheduledWidget::listSource(
 		int limitBefore,
 		int limitAfter) {
 	const auto data = &controller()->session().data();
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		data->scheduledMessages().updates(_history)
 	) | rpl::map([=] {
 		return data->scheduledMessages().list(_history);

Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp

@@ -89,9 +89,7 @@ void Provider::refreshViewer() {
 		return;
 	}
 	auto &manager = Core::App().downloadManager();
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		manager.loadingListChanges() | rpl::to_empty
 	) | rpl::start_with_next([=, &manager] {
 		auto copy = _downloading;

Telegram/SourceFiles/info/profile/info_profile_values.cpp

@@ -405,9 +405,7 @@ rpl::producer<bool> CanAddMemberValue(not_null<PeerData*> peer) {
 rpl::producer<int> FullReactionsCountValue(
 		not_null<Main::Session*> session) {
 	const auto reactions = &session->data().reactions();
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		reactions->updates()
 	) | rpl::map([=] {
 		return int(reactions->list(Data::Reactions::Type::Active).size());

Telegram/SourceFiles/intro/intro_qr.cpp

@@ -75,9 +75,7 @@ namespace {
 	) | rpl::map([](const QByteArray &code) {
 		return Qr::Encode(code, Qr::Redundancy::Quartile);
 	});
-	auto palettes = rpl::single(
+	auto palettes = rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		style::PaletteChanged()
 	);
 	auto result = Ui::CreateChild<Ui::RpWidget>(parent.get());

Telegram/SourceFiles/intro/intro_widget.cpp

@@ -149,7 +149,7 @@ Widget::Widget(
 		Core::UpdateChecker checker;
 		checker.start();
 		rpl::merge(
-			rpl::single(rpl::empty_value()),
+			rpl::single(rpl::empty),
 			checker.isLatest(),
 			checker.failed(),
 			checker.ready()

Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.mm

@@ -688,9 +688,7 @@ TimeId CalculateOnlineTill(not_null<PeerData*> peer) {
 		updateUserpics();
 	};
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		_session->data().pinnedDialogsOrderUpdated()
 	) | rpl::start_with_next(updatePinnedChats, _lifetime);
 

Telegram/SourceFiles/settings/settings_folders.cpp

@@ -443,9 +443,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 	AddSubsectionTitle(aboutRows, tr::lng_filters_recommended());
 
 	const auto suggested = lifetime.make_state<rpl::variable<int>>();
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		session->data().chatsFilters().suggestedUpdated()
 	) | rpl::map([=] {
 		return session->data().chatsFilters().suggestedFilters();

Telegram/SourceFiles/settings/settings_main.cpp

@@ -301,9 +301,7 @@ void SetupSections(
 			}
 		};
 		slided->toggleOn(
-			rpl::single(
+			rpl::single(rpl::empty) | rpl::then(
-				rpl::empty_value()
-			) | rpl::then(
 				account->appConfig().refreshed()
 			) | rpl::map(
 				enabled

Telegram/SourceFiles/settings/settings_privacy_security.cpp

@@ -229,9 +229,7 @@ void SetupLocalPasscode(
 	AddSkip(container);
 	AddSubsectionTitle(container, tr::lng_settings_passcode_title());
 
-	auto has = rpl::single(
+	auto has = rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		controller->session().domain().local().localPasscodeChanged()
 	) | rpl::map([=] {
 		return controller->session().domain().local().hasLocalPasscode();
@@ -272,7 +270,7 @@ void SetupLocalPasscode(
 		? tr::lng_passcode_autolock_away
 		: tr::lng_passcode_autolock_inactive;
 	auto value = autoLockBoxClosing->events_starting_with(
-		rpl::empty_value()
+		{}
 	) | rpl::map([] {
 		const auto autolock = Core::App().settings().autoLock();
 		const auto hours = autolock / 3600;
@@ -471,9 +469,7 @@ void SetupCloudPassword(
 	) | rpl::filter([](TimeId time) {
 		return time != 0;
 	}) | rpl::map([](TimeId time) {
-		return rpl::single(
+		return rpl::single(rpl::empty) | rpl::then(base::timer_each(
-			rpl::empty_value()
-		) | rpl::then(base::timer_each(
 			999
 		)) | rpl::map([=] {
 			const auto now = base::unixtime::now();

Telegram/SourceFiles/ui/chat/attach/attach_item_single_file_preview.cpp

@@ -47,9 +47,7 @@ ItemSingleFilePreview::ItemSingleFilePreview(
 	_documentMedia = document->createMediaView();
 	_documentMedia->thumbnailWanted(item->fullId());
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		document->session().downloaderTaskFinished()
 	) | rpl::start_with_next([=] {
 		if (_documentMedia->thumbnail()) {

Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp

@@ -82,9 +82,7 @@ ItemSingleMediaPreview::ItemSingleMediaPreview(
 		}
 	};
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		session->downloaderTaskFinished()
 	) | rpl::start_with_next([=] {
 		const auto computed = computeThumbInfo();

Telegram/SourceFiles/ui/chat/choose_send_as.cpp

@@ -181,7 +181,7 @@ void SetupSendAsButton(
 		const auto channel = peer->asMegagroup();
 
 		auto updates = rpl::single(
-			rpl::empty_value()
+			rpl::empty
 		) | rpl::then(channel->session().sendAsPeers().updated(
 		) | rpl::filter(
 			_1 == channel

Telegram/SourceFiles/ui/chat/group_call_bar.cpp

@@ -231,9 +231,7 @@ void GroupCallBar::setupInner() {
 				static_cast<QMouseEvent*>(event.get())->pos());
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::map([] {
+	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
-		return rpl::empty_value();
-	}) | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {

Telegram/SourceFiles/ui/chat/pinned_bar.cpp

@@ -135,13 +135,15 @@ void PinnedBar::createControls() {
 				static_cast<QMouseEvent*>(event.get())->pos());
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::map([] {
+	) | rpl::to_empty | rpl::start_to_stream(
-		return rpl::empty_value();
+		_barClicks,
-	}) | rpl::start_to_stream(_barClicks, _bar->widget()->lifetime());
+		_bar->widget()->lifetime());
 
 	_bar->widget()->move(0, 0);
 	_bar->widget()->show();
-	_wrap.entity()->resize(_wrap.entity()->width(), _bar->widget()->height());
+	_wrap.entity()->resize(
+		_wrap.entity()->width(),
+		_bar->widget()->height());
 
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {

Telegram/SourceFiles/ui/chat/requests_bar.cpp

@@ -124,9 +124,7 @@ void RequestsBar::setupInner() {
 				static_cast<QMouseEvent*>(event.get())->pos());
 		});
 	}) | rpl::flatten_latest(
-	) | rpl::map([] {
+	) | rpl::to_empty | rpl::start_to_stream(_barClicks, _inner->lifetime());
-		return rpl::empty_value();
-	}) | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {

Telegram/SourceFiles/window/section_widget.cpp

@@ -74,9 +74,7 @@ AbstractSectionWidget::AbstractSectionWidget(
 		peerForBackground
 	) | rpl::map([=](PeerData *peer) -> rpl::producer<> {
 		if (!peer) {
-			return rpl::single(
+			return rpl::single(rpl::empty) | rpl::then(
-				rpl::empty_value()
-			) | rpl::then(
 				controller->defaultChatTheme()->repaintBackgroundRequests()
 			);
 		}
@@ -84,9 +82,7 @@ AbstractSectionWidget::AbstractSectionWidget(
 			controller,
 			peer
 		) | rpl::map([](const std::shared_ptr<Ui::ChatTheme> &theme) {
-			return rpl::single(
+			return rpl::single(rpl::empty) | rpl::then(
-				rpl::empty_value()
-			) | rpl::then(
 				theme->repaintBackgroundRequests()
 			);
 		}) | rpl::flatten_latest();

Telegram/SourceFiles/window/themes/window_theme.cpp

@@ -1371,9 +1371,7 @@ rpl::producer<bool> IsNightModeValue() {
 		return update.type == BackgroundUpdate::Type::ApplyingTheme;
 	}) | rpl::to_empty;
 
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		std::move(changes)
 	) | rpl::map([=] {
 		return IsNightMode();
@@ -1455,9 +1453,7 @@ bool LoadFromContent(
 }
 
 rpl::producer<bool> IsThemeDarkValue() {
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		style::PaletteChanged()
 	) | rpl::map([] {
 		return (st::dialogsBg->c.valueF() < kDarkValueThreshold);

Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp

@@ -336,9 +336,7 @@ void CloudList::setup() {
 			object.cloud.id ? object.cloud.id : kFakeCloudThemeId));
 	});
 
-	auto cloudListChanges = rpl::single(
+	auto cloudListChanges = rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		_window->session().data().cloudThemes().updated()
 	);
 

Telegram/SourceFiles/window/window_connecting_widget.cpp

@@ -222,7 +222,7 @@ ConnectionState::ConnectionState(
 	if (!Core::UpdaterDisabled()) {
 		Core::UpdateChecker checker;
 		rpl::merge(
-			rpl::single(rpl::empty_value()),
+			rpl::single(rpl::empty),
 			checker.ready()
 		) | rpl::start_with_next([=] {
 			refreshState();

Telegram/SourceFiles/window/window_filters_menu.cpp

@@ -34,7 +34,7 @@ namespace {
 
 [[nodiscard]] rpl::producer<Dialogs::UnreadState> MainListUnreadState(
 		not_null<Dialogs::MainList*> list) {
-	return rpl::single(rpl::empty_value()) | rpl::then(
+	return rpl::single(rpl::empty) | rpl::then(
 		list->unreadStateChanges() | rpl::to_empty
 	) | rpl::map([=] {
 		return list->unreadState();
@@ -103,9 +103,7 @@ void FiltersMenu::setup() {
 	}, _outer.lifetime());
 
 	const auto filters = &_session->session().data().chatsFilters();
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		filters->changed()
 	) | rpl::start_with_next([=] {
 		refresh();

Telegram/SourceFiles/window/window_main_menu.cpp

@@ -240,9 +240,7 @@ void AddUnreadBadge(
 	const auto state = raw->lifetime().make_state<State>(raw);
 
 	if (!active) {
-		AddUnreadBadge(raw, rpl::single(
+		AddUnreadBadge(raw, rpl::single(rpl::empty) | rpl::then(
-			rpl::empty_value()
-		) | rpl::then(
 			session->data().unreadBadgeChanges()
 		) | rpl::map([=] {
 			auto &owner = session->data();
@@ -380,9 +378,7 @@ protected:
 
 MainMenu::ToggleAccountsButton::ToggleAccountsButton(QWidget *parent)
 : AbstractButton(parent) {
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		Core::App().unreadBadgeChanges()
 	) | rpl::start_with_next([=] {
 		_unreadBadgeStale = true;
@@ -743,9 +739,7 @@ void MainMenu::setupArchive() {
 			return folder && (folder->id() == Data::Folder::kId);
 		}) | rpl::take(1);
 
-	AddUnreadBadge(button, rpl::single(
+	AddUnreadBadge(button, rpl::single(rpl::empty) | rpl::then(std::move(
-		rpl::empty_value()
-	) | rpl::then(std::move(
 		folderValue
 	) | rpl::map([=](not_null<Data::Folder*> folder) {
 		return folder->owner().chatsList(folder)->unreadStateChanges();
@@ -789,10 +783,9 @@ void MainMenu::setupAccounts() {
 	_addAccount = setupAddAccount(inner);
 	inner->add(object_ptr<Ui::FixedHeightWidget>(inner, st::mainMenuSkip));
 
-	rpl::single(
+	rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
+		Core::App().domain().accountsChanges()
-	) | rpl::then(Core::App().domain().accountsChanges(
+	) | rpl::start_with_next([=] {
-	)) | rpl::start_with_next([=] {
 		const auto &list = Core::App().domain().accounts();
 		const auto exists = [&](not_null<Main::Account*> account) {
 			for (const auto &[index, existing] : list) {
@@ -1206,12 +1199,9 @@ OthersUnreadState OtherAccountsUnreadStateCurrent() {
 }
 
 rpl::producer<OthersUnreadState> OtherAccountsUnreadState() {
-	return rpl::single(
+	return rpl::single(rpl::empty) | rpl::then(
-		rpl::empty_value()
-	) | rpl::then(
 		Core::App().unreadBadgeChanges()
 	) | rpl::map(OtherAccountsUnreadStateCurrent);
 }
 
-
 } // namespace Window

Telegram/lib_base

@@ -1 +1 @@
-Subproject commit 3669e28e8767669dda7ff2d847eb2e30d18ea796
+Subproject commit 03698385aa794fafd613a745371b5ade556ce5fa

Telegram/lib_rpl

@@ -1 +1 @@
-Subproject commit 94a42b775ab4e46e5edeb88d8ed6c06f9e869c61
+Subproject commit 6ee3948b61cffdab672d75ea33266ea00731b3cf