Respect wallpaper_overriden flag.

Telegram/SourceFiles/api/api_updates.cpp

@@ -1996,7 +1996,8 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		if (const auto peer = session().data().peerLoaded(peerFromMTP(d.vpeer()))) {
 			if (const auto paper = d.vwallpaper()) {
 				peer->setWallPaper(
-					Data::WallPaper::Create(&session(), *paper));
+					Data::WallPaper::Create(&session(), *paper),
+					d.is_wallpaper_overridden());
 			} else {
 				peer->setWallPaper({});
 			}

Telegram/SourceFiles/boxes/background_box.cpp

@@ -310,7 +310,7 @@ void BackgroundBox::resetForPeer() {
 	}).send();
 
 	const auto weak = Ui::MakeWeak(this);
-	_forPeer->setWallPaper(std::nullopt);
+	_forPeer->setWallPaper({});
 	if (weak) {
 		_controller->finishChatThemeEdit(_forPeer);
 	}

Telegram/SourceFiles/data/data_peer.cpp

@@ -1227,16 +1227,30 @@ const QString &PeerData::themeEmoji() const {
 	return _themeEmoticon;
 }
 
-void PeerData::setWallPaper(std::optional<Data::WallPaper> paper) {
-	if (!paper && !_wallPaper) {
-		return;
-	} else if (paper && _wallPaper && _wallPaper->equals(*paper)) {
-		return;
+void PeerData::setWallPaper(
+		std::optional<Data::WallPaper> paper,
+		bool overriden) {
+	const auto paperChanged = (paper || _wallPaper)
+		&& (!paper || !_wallPaper || !_wallPaper->equals(*paper));
+	if (paperChanged) {
+		_wallPaper = paper
+			? std::make_unique<Data::WallPaper>(std::move(*paper))
+			: nullptr;
 	}
-	_wallPaper = paper
-		? std::make_unique<Data::WallPaper>(std::move(*paper))
-		: nullptr;
-	session().changes().peerUpdated(this, UpdateFlag::ChatWallPaper);
+
+	const auto overridenValue = overriden ? 1 : 0;
+	const auto overridenChanged = (_wallPaperOverriden != overridenValue);
+	if (overridenChanged) {
+		_wallPaperOverriden = overridenValue;
+	}
+
+	if (paperChanged || overridenChanged) {
+		session().changes().peerUpdated(this, UpdateFlag::ChatWallPaper);
+	}
+}
+
+bool PeerData::wallPaperOverriden() const {
+	return _wallPaperOverriden != 0;
 }
 
 const Data::WallPaper *PeerData::wallPaper() const {

Telegram/SourceFiles/data/data_peer.h

@@ -414,7 +414,10 @@ public:
 	void setThemeEmoji(const QString &emoticon);
 	[[nodiscard]] const QString &themeEmoji() const;
 
-	void setWallPaper(std::optional<Data::WallPaper> paper);
+	void setWallPaper(
+		std::optional<Data::WallPaper> paper,
+		bool overriden = false);
+	[[nodiscard]] bool wallPaperOverriden() const;
 	[[nodiscard]] const Data::WallPaper *wallPaper() const;
 
 	enum class StoriesState {
@@ -467,7 +470,8 @@ private:
 	crl::time _lastFullUpdate = 0;
 
 	QString _name;
-	int _nameVersion = 1;
+	uint32 _nameVersion : 31 = 1;
+	uint32 _wallPaperOverriden : 1 = 0;
 
 	TimeId _ttlPeriod = 0;
 
@@ -475,6 +479,7 @@ private:
 	TimeId _requestChatDate = 0;
 
 	Settings _settings = PeerSettings(PeerSetting::Unknown);
+
 	BlockStatus _blockStatus = BlockStatus::Unknown;
 	LoadedStatus _loadedStatus = LoadedStatus::Not;
 	TranslationFlag _translationFlag = TranslationFlag::Unknown;

Telegram/SourceFiles/data/data_user.cpp

@@ -515,7 +515,8 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 
 	if (const auto paper = update.vwallpaper()) {
 		user->setWallPaper(
-			Data::WallPaper::Create(&user->session(), *paper));
+			Data::WallPaper::Create(&user->session(), *paper),
+			update.is_wallpaper_overridden());
 	} else {
 		user->setWallPaper({});
 	}

Telegram/SourceFiles/history/history.cpp

@@ -1195,7 +1195,8 @@ void History::applyServiceChanges(
 	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
 		if (item->out() || data.is_for_both()) {
 			peer->setWallPaper(
-				Data::WallPaper::Create(&session(), data.vwallpaper()));
+				Data::WallPaper::Create(&session(), data.vwallpaper()),
+				!item->out() && data.is_for_both());
 		}
 	}, [&](const MTPDmessageActionChatJoinedByRequest &data) {
 		processJoinedPeer(item->from());

Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp

@@ -40,22 +40,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
-[[nodiscard]] bool HasThatWallPaperForBoth(
+[[nodiscard]] bool WallPaperRevertable(
 		not_null<PeerData*> peer,
 		const Data::WallPaper &paper) {
+	if (!peer->wallPaperOverriden()) {
+		return false;
+	}
 	const auto now = peer->wallPaper();
 	return now && now->equals(paper);
 }
 
-[[nodiscard]] bool HasThatWallPaperForBoth(not_null<HistoryItem*> item) {
+[[nodiscard]] bool WallPaperRevertable(not_null<HistoryItem*> item) {
 	const auto media = item->media();
 	const auto paper = media ? media->paper() : nullptr;
 	return paper
 		&& media->paperForBoth()
-		&& HasThatWallPaperForBoth(item->history()->peer, *paper);
+		&& WallPaperRevertable(item->history()->peer, *paper);
 }
 
-[[nodiscard]] rpl::producer<bool> HasThatWallPaperForBothValue(
+[[nodiscard]] rpl::producer<bool> WallPaperRevertableValue(
 		not_null<HistoryItem*> item) {
 	const auto media = item->media();
 	const auto paper = media ? media->paper() : nullptr;
@@ -67,7 +70,7 @@ namespace {
 		peer,
 		Data::PeerUpdate::Flag::ChatWallPaper
 	) | rpl::map([peer, paper = *paper] {
-		return HasThatWallPaperForBoth(peer, paper);
+		return WallPaperRevertable(peer, paper);
 	});
 }
 
@@ -499,7 +502,7 @@ rpl::producer<QString> ThemeDocumentBox::button() {
 	return _parent->data()->out()
 		? nullptr
 		: rpl::conditional(
-			HasThatWallPaperForBothValue(_parent->data()),
+			WallPaperRevertableValue(_parent->data()),
 			tr::lng_action_set_wallpaper_remove(),
 			tr::lng_action_set_wallpaper_button());
 }
@@ -518,7 +521,7 @@ ClickHandlerPtr ThemeDocumentBox::createViewLink() {
 			const auto view = weak.get();
 			if (view
 				&& !view->data()->out()
-				&& HasThatWallPaperForBoth(view->data())) {
+				&& WallPaperRevertable(view->data())) {
 				const auto reset = crl::guard(weak, [=](Fn<void()> close) {
 					const auto api = &controller->session().api();
 					api->request(MTPmessages_SetChatWallPaper(