Slightly refactored code for info of statistic for single message.

Telegram/SourceFiles/info/statistics/info_statistics_public_forwards.cpp

@@ -21,6 +21,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Info::Statistics {
 namespace {
 
+struct Descriptor final {
+	Api::PublicForwards::Slice firstSlice;
+	Fn<void(FullMsgId)> showPeerHistory;
+	not_null<PeerData*> peer;
+	FullMsgId contextId;
+};
+
 class PeerListRowWithMsgId : public PeerListRow {
 public:
 	using PeerListRow::PeerListRow;
@@ -43,10 +50,7 @@ MsgId PeerListRowWithMsgId::msgId() const {
 
 class PublicForwardsController final : public PeerListController {
 public:
-	explicit PublicForwardsController(
+	explicit PublicForwardsController(Descriptor d);
-		Fn<void(FullMsgId)> showPeerHistory,
-		not_null<PeerData*> peer,
-		FullMsgId contextId);
 
 	Main::Session &session() const override;
 	void prepare() override;
@@ -57,11 +61,13 @@ public:
 
 private:
 	bool appendRow(not_null<PeerData*> peer, MsgId msgId);
+	void applySlice(const Api::PublicForwards::Slice &slice);
 
 	const not_null<Main::Session*> _session;
 	Fn<void(FullMsgId)> _showPeerHistory;
 
 	Api::PublicForwards _api;
+	Api::PublicForwards::Slice _firstSlice;
 	Api::PublicForwards::OffsetToken _apiToken;
 
 	bool _allLoaded = false;
@@ -70,13 +76,11 @@ private:
 
 };
 
-PublicForwardsController::PublicForwardsController(
+PublicForwardsController::PublicForwardsController(Descriptor d)
-	Fn<void(FullMsgId)> showPeerHistory,
+: _session(&d.peer->session())
-	not_null<PeerData*> peer,
+, _showPeerHistory(std::move(d.showPeerHistory))
-	FullMsgId contextId)
+, _api(d.peer->asChannel(), d.contextId)
-: _session(&peer->session())
+, _firstSlice(std::move(d.firstSlice)) {
-, _showPeerHistory(std::move(showPeerHistory))
-, _api(peer->asChannel(), contextId) {
 }
 
 Main::Session &PublicForwardsController::session() const {
@@ -84,7 +88,7 @@ Main::Session &PublicForwardsController::session() const {
 }
 
 void PublicForwardsController::prepare() {
-	loadMoreRows();
+	applySlice(base::take(_firstSlice));
 	delegate()->peerListRefreshRows();
 }
 
@@ -93,6 +97,12 @@ void PublicForwardsController::loadMoreRows() {
 		return;
 	}
 	_api.request(_apiToken, [=](const Api::PublicForwards::Slice &slice) {
+		applySlice(slice);
+	});
+}
+
+void PublicForwardsController::applySlice(
+		const Api::PublicForwards::Slice &slice) {
 	_allLoaded = slice.allLoaded;
 	_apiToken = slice.token;
 	_totalCountChanges.fire_copy(slice.total);
@@ -103,7 +113,6 @@ void PublicForwardsController::loadMoreRows() {
 		}
 	}
 	delegate()->peerListRefreshRows();
-	});
 }
 
 void PublicForwardsController::rowClicked(not_null<PeerListRow*> row) {
@@ -150,53 +159,42 @@ rpl::producer<int> PublicForwardsController::totalCountChanges() const {
 
 } // namespace
 
-PublicShares AddPublicForwards(
+void AddPublicForwards(
+		const Api::MessageStatistics &firstSliceHolder,
 		not_null<Ui::VerticalLayout*> container,
 		Fn<void(FullMsgId)> showPeerHistory,
 		not_null<PeerData*> peer,
 		FullMsgId contextId) {
 	if (!peer->isChannel()) {
-		return rpl::never<int>();
+		return;
 	}
 
 	struct State final {
-		State(
+		State(Descriptor d) : controller(std::move(d)) {
-			Fn<void(FullMsgId)> c,
-			not_null<PeerData*> p,
-			FullMsgId i) : controller(std::move(c), p, i) {
 		}
 		PeerListContentDelegateSimple delegate;
 		PublicForwardsController controller;
 	};
-	const auto state = container->lifetime().make_state<State>(
+	const auto state = container->lifetime().make_state<State>(Descriptor{
+		firstSliceHolder.firstSlice(),
 		std::move(showPeerHistory),
 		peer,
-		contextId);
+		contextId,
-
-	auto title = state->controller.totalCountChanges(
-	) | rpl::distinct_until_changed(
-	) | rpl::map([=](int total) {
-		return total
-			? tr::lng_stats_overview_message_public_share(
-				tr::now,
-				lt_count_decimal,
-				total)
-			: QString();
 	});
 
-	{
+	if (const auto total = firstSliceHolder.firstSlice().total; total > 0) {
 		const auto &subtitlePadding = st::settingsButton.padding;
 		::Settings::AddSubsectionTitle(
 			container,
-			std::move(title),
+			tr::lng_stats_overview_message_public_share(
+				lt_count_decimal,
+				rpl::single<float64>(total)),
 			{ 0, -subtitlePadding.top(), 0, -subtitlePadding.bottom() });
 	}
+
 	state->delegate.setContent(container->add(
 		object_ptr<PeerListContent>(container, &state->controller)));
 	state->controller.setDelegate(&state->delegate);
-
-	return state->controller.totalCountChanges(
-	) | rpl::distinct_until_changed();
 }
 
 } // namespace Info::Statistics

Telegram/SourceFiles/info/statistics/info_statistics_public_forwards.h

@@ -13,11 +13,14 @@ namespace Ui {
 class VerticalLayout;
 } // namespace Ui
 
+namespace Api {
+class MessageStatistics;
+} // namespace Api
+
 namespace Info::Statistics {
 
-using PublicShares = rpl::producer<int>;
+void AddPublicForwards(
-
+	const Api::MessageStatistics &firstSliceHolder,
-[[nodiscard]] PublicShares AddPublicForwards(
 	not_null<Ui::VerticalLayout*> container,
 	Fn<void(FullMsgId)> showPeerHistory,
 	not_null<PeerData*> peer,

Telegram/SourceFiles/info/statistics/info_statistics_widget.cpp

@@ -45,15 +45,7 @@ struct Descriptor final {
 struct AnyStats final {
 	Data::ChannelStatistics channel;
 	Data::SupergroupStatistics supergroup;
-	struct Message {
+	Data::MessageStatistics message;
-		explicit operator bool() const {
-			return !graph.chart.empty();
-		}
-		Data::StatisticalGraph graph;
-		int publicForwards = 0;
-		int privateForwards = 0;
-		int views = 0;
-	} message;
 };
 
 void ProcessZoom(
@@ -221,7 +213,7 @@ void FillStatistic(
 		// 	Type::StackLinear);
 	} else if (const auto message = stats.message) {
 		addChart(
-			message.graph,
+			message.messageInteractionGraph,
 			tr::lng_chart_title_message_interaction(),
 			Type::DoubleLinear);
 	}
@@ -628,37 +620,16 @@ Widget::Widget(
 			}, inner->lifetime());
 		} else {
 			const auto weak = base::make_weak(controller);
+			const auto lifetime = inner->lifetime(
+			).make_state<rpl::lifetime>();
+			const auto api = lifetime->make_state<Api::MessageStatistics>(
+				descriptor.peer->asChannel(),
+				contextId);
 
-			descriptor.api->requestMessage(
+			api->request([=](const Data::MessageStatistics &data) {
-				descriptor.peer,
+				const auto stats = AnyStats{ .message = data };
-				contextId.msg
+				FillOverview(inner, stats);
-			) | rpl::take(
+				FillStatistic(inner, descriptor, stats);
-				1
-			) | rpl::start_with_next([=](const Data::StatisticalGraph &data) {
-				descriptor.api->request(
-					descriptor.peer
-				) | rpl::start_with_done([=] {
-					const auto channel = descriptor.api->channelStats();
-					auto info = Data::StatisticsMessageInteractionInfo();
-					for (const auto &r : channel.recentMessageInteractions) {
-						if (r.messageId == contextId.msg) {
-							info = r;
-							break;
-						}
-					}
-
-					const auto wrapAbove = inner->add(
-						object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-							inner,
-							object_ptr<Ui::VerticalLayout>(inner)));
-					wrapAbove->toggle(false, anim::type::instant);
-
-					const auto wrapBelow = inner->add(
-						object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-							inner,
-							object_ptr<Ui::VerticalLayout>(inner)));
-					wrapBelow->toggle(false, anim::type::instant);
-
 				auto showPeerHistory = [=](FullMsgId fullId) {
 					if (const auto strong = weak.get()) {
 						controller->showPeerHistory(
@@ -667,33 +638,16 @@ Widget::Widget(
 							fullId.msg);
 					}
 				};
-					auto sharesCount = AddPublicForwards(
+				AddPublicForwards(
-						wrapBelow->entity(),
+					*api,
+					inner,
 					std::move(showPeerHistory),
 					descriptor.peer,
 					contextId);
 
-					std::move(sharesCount) | rpl::take(
-						1
-					) | rpl::start_with_next([=](int count) {
-						const auto stats = AnyStats{
-							.message = {
-								.graph = data,
-								.publicForwards = count,
-								.privateForwards = info.forwardsCount - count,
-								.views = info.viewsCount,
-							}
-						};
-						FillOverview(wrapAbove->entity(), stats);
-						FillStatistic(wrapAbove->entity(), descriptor, stats);
-
-						wrapAbove->toggle(true, anim::type::instant);
-						wrapBelow->toggle(true, anim::type::instant);
-
 				finishLoading();
-					}, inner->lifetime());
+				lifetime->destroy();
-				}, inner->lifetime());
+			});
-			}, inner->lifetime());
 		}
 	}, lifetime);
 }