Moved out top promo from api and suggestions from config to single file.

Telegram/SourceFiles/data/components/promo_suggestions.cpp

@@ -0,0 +1,197 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/components/promo_suggestions.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "core/core_settings.h"
+#include "data/data_changes.h"
+#include "data/data_histories.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "main/main_session.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kTopPromotionInterval = TimeId(60 * 60);
+constexpr auto kTopPromotionMinDelay = TimeId(10);
+
+} // namespace
+
+PromoSuggestions::PromoSuggestions(not_null<Main::Session*> session)
+: _session(session)
+, _topPromotionTimer([=] { refreshTopPromotion(); }) {
+	Core::App().settings().proxy().connectionTypeValue(
+	) | rpl::start_with_next([=] {
+		refreshTopPromotion();
+	}, _lifetime);
+}
+
+PromoSuggestions::~PromoSuggestions() = default;
+
+void PromoSuggestions::refreshTopPromotion() {
+	const auto now = base::unixtime::now();
+	const auto next = (_topPromotionNextRequestTime != 0)
+		? _topPromotionNextRequestTime
+		: now;
+	if (_topPromotionRequestId) {
+		getTopPromotionDelayed(now, next);
+		return;
+	}
+	const auto key = [&]() -> std::pair<QString, uint32> {
+		if (!Core::App().settings().proxy().isEnabled()) {
+			return {};
+		}
+		const auto &proxy = Core::App().settings().proxy().selected();
+		if (proxy.type != MTP::ProxyData::Type::Mtproto) {
+			return {};
+		}
+		return { proxy.host, proxy.port };
+	}();
+	if (_topPromotionKey == key && now < next) {
+		getTopPromotionDelayed(now, next);
+		return;
+	}
+	_topPromotionKey = key;
+	_topPromotionRequestId = _session->api().request(MTPhelp_GetPromoData(
+	)).done([=](const MTPhelp_PromoData &result) {
+		_topPromotionRequestId = 0;
+		topPromotionDone(result);
+	}).fail([=] {
+		_topPromotionRequestId = 0;
+		const auto now = base::unixtime::now();
+		const auto next = _topPromotionNextRequestTime = now
+			+ kTopPromotionInterval;
+		if (!_topPromotionTimer.isActive()) {
+			getTopPromotionDelayed(now, next);
+		}
+	}).send();
+}
+
+void PromoSuggestions::getTopPromotionDelayed(TimeId now, TimeId next) {
+	_topPromotionTimer.callOnce(std::min(
+		std::max(next - now, kTopPromotionMinDelay),
+		kTopPromotionInterval) * crl::time(1000));
+};
+
+void PromoSuggestions::topPromotionDone(const MTPhelp_PromoData &proxy) {
+	_topPromotionNextRequestTime = proxy.match([&](const auto &data) {
+		return data.vexpires().v;
+	});
+	getTopPromotionDelayed(
+		base::unixtime::now(),
+		_topPromotionNextRequestTime);
+
+	proxy.match([&](const MTPDhelp_promoDataEmpty &data) {
+		setTopPromoted(nullptr, QString(), QString());
+	}, [&](const MTPDhelp_promoData &data) {
+		_session->data().processChats(data.vchats());
+		_session->data().processUsers(data.vusers());
+
+		auto changedPendingSuggestions = false;
+		auto pendingSuggestions = ranges::views::all(
+			data.vpending_suggestions().v
+		) | ranges::views::transform([](const auto &suggestion) {
+			return qs(suggestion);
+		}) | ranges::to_vector;
+		if (!ranges::equal(_pendingSuggestions, pendingSuggestions)) {
+			_pendingSuggestions = std::move(pendingSuggestions);
+			changedPendingSuggestions = true;
+		}
+
+		auto changedDismissedSuggestions = false;
+		for (const auto &suggestion : data.vdismissed_suggestions().v) {
+			changedDismissedSuggestions
+				|= _dismissedSuggestions.emplace(qs(suggestion)).second;
+		}
+
+		if (changedPendingSuggestions || changedDismissedSuggestions) {
+			_refreshed.fire({});
+		}
+
+		if (const auto peer = data.vpeer()) {
+			const auto peerId = peerFromMTP(*peer);
+			const auto history = _session->data().history(peerId);
+			setTopPromoted(
+				history,
+				data.vpsa_type().value_or_empty(),
+				data.vpsa_message().value_or_empty());
+		} else {
+			setTopPromoted(nullptr, QString(), QString());
+		}
+	});
+}
+
+rpl::producer<> PromoSuggestions::value() const {
+	return _refreshed.events_starting_with({});
+}
+
+void PromoSuggestions::setTopPromoted(
+		History *promoted,
+		const QString &type,
+		const QString &message) {
+	const auto changed = (_topPromoted != promoted);
+	if (!changed
+		&& (!promoted || promoted->topPromotionMessage() == message)) {
+		return;
+	}
+	if (changed) {
+		if (_topPromoted) {
+			_topPromoted->cacheTopPromotion(false, QString(), QString());
+		}
+	}
+	const auto old = std::exchange(_topPromoted, promoted);
+	if (_topPromoted) {
+		_session->data().histories().requestDialogEntry(_topPromoted);
+		_topPromoted->cacheTopPromotion(true, type, message);
+		_topPromoted->requestChatListMessage();
+		_session->changes().historyUpdated(
+			_topPromoted,
+			HistoryUpdate::Flag::TopPromoted);
+	}
+	if (changed && old) {
+		_session->changes().historyUpdated(
+			old,
+			HistoryUpdate::Flag::TopPromoted);
+	}
+}
+
+bool PromoSuggestions::current(const QString &key) const {
+	if (key == u"BIRTHDAY_CONTACTS_TODAY"_q) {
+		if (_dismissedSuggestions.contains(key)) {
+			return false;
+		} else {
+			const auto known
+				= _session->data().knownBirthdaysToday();
+			if (!known) {
+				return true;
+			}
+			return !known->empty();
+		}
+	}
+	return !_dismissedSuggestions.contains(key)
+		&& ranges::contains(_pendingSuggestions, key);
+}
+
+rpl::producer<> PromoSuggestions::requested(const QString &key) const {
+	return value() | rpl::filter([=] { return current(key); });
+}
+
+void PromoSuggestions::dismiss(const QString &key) {
+	if (!_dismissedSuggestions.emplace(key).second) {
+		return;
+	}
+	_session->api().request(MTPhelp_DismissSuggestion(
+		MTP_inputPeerEmpty(),
+		MTP_string(key)
+	)).send();
+}
+
+} // namespace Data

Telegram/SourceFiles/data/components/promo_suggestions.h

@@ -0,0 +1,61 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+class History;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Data {
+
+class PromoSuggestions final {
+public:
+	explicit PromoSuggestions(not_null<Main::Session*> session);
+	~PromoSuggestions();
+
+	[[nodiscard]] bool current(const QString &key) const;
+	[[nodiscard]] rpl::producer<> requested(
+		const QString &key) const;
+	void dismiss(const QString &key);
+
+	void refreshTopPromotion();
+
+	rpl::producer<> value() const;
+	// Create rpl::producer<> refreshed() const; on memand.
+
+private:
+	void setTopPromoted(
+		History *promoted,
+		const QString &type,
+		const QString &message);
+
+	void getTopPromotionDelayed(TimeId now, TimeId next);
+	void topPromotionDone(const MTPhelp_PromoData &proxy);
+
+	const not_null<Main::Session*> _session;
+	base::flat_set<QString> _dismissedSuggestions;
+	std::vector<QString> _pendingSuggestions;
+
+	History *_topPromoted = nullptr;
+
+	mtpRequestId _topPromotionRequestId = 0;
+	std::pair<QString, uint32> _topPromotionKey;
+	TimeId _topPromotionNextRequestTime = TimeId(0);
+	base::Timer _topPromotionTimer;
+
+	rpl::event_stream<> _refreshed;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Data

Telegram/SourceFiles/data/data_session.cpp

@@ -4807,36 +4807,6 @@ MessageIdsList Session::takeMimeForwardIds() {
 	return std::move(_mimeForwardIds);
 }
 
-void Session::setTopPromoted(
-		History *promoted,
-		const QString &type,
-		const QString &message) {
-	const auto changed = (_topPromoted != promoted);
-	if (!changed
-		&& (!promoted || promoted->topPromotionMessage() == message)) {
-		return;
-	}
-	if (changed) {
-		if (_topPromoted) {
-			_topPromoted->cacheTopPromotion(false, QString(), QString());
-		}
-	}
-	const auto old = std::exchange(_topPromoted, promoted);
-	if (_topPromoted) {
-		histories().requestDialogEntry(_topPromoted);
-		_topPromoted->cacheTopPromotion(true, type, message);
-		_topPromoted->requestChatListMessage();
-		session().changes().historyUpdated(
-			_topPromoted,
-			HistoryUpdate::Flag::TopPromoted);
-	}
-	if (changed && old) {
-		session().changes().historyUpdated(
-			old,
-			HistoryUpdate::Flag::TopPromoted);
-	}
-}
-
 bool Session::updateWallpapers(const MTPaccount_WallPapers &data) {
 	return data.match([&](const MTPDaccount_wallPapers &data) {
 		setWallpapers(data.vwallpapers().v, data.vhash().v);

Telegram/SourceFiles/data/data_session.h

@@ -801,11 +801,6 @@ public:
 	void setMimeForwardIds(MessageIdsList &&list);
 	MessageIdsList takeMimeForwardIds();
 
-	void setTopPromoted(
-		History *promoted,
-		const QString &type,
-		const QString &message);
-
 	bool updateWallpapers(const MTPaccount_WallPapers &data);
 	void removeWallpaper(const WallPaper &paper);
 	const std::vector<WallPaper> &wallpapers() const;
@@ -1129,8 +1124,6 @@ private:
 		ReactionId,
 		base::flat_set<not_null<ViewElement*>>> _viewsByTag;
 
-	History *_topPromoted = nullptr;
-
 	std::unordered_map<PeerId, std::unique_ptr<PeerData>> _peers;
 
 	MessageIdsList _mimeForwardIds;