Fixed API support of public forwards in statistics info.

Telegram/SourceFiles/api/api_statistics.cpp

@@ -361,139 +361,27 @@ PublicForwards::PublicForwards(
 void PublicForwards::request(
 		const Data::PublicForwardsSlice::OffsetToken &token,
 		Fn<void(Data::PublicForwardsSlice)> done) {
-	if (!_requestId) {
+	if (_requestId) {
-		if (_fullId.messageId) {
+		return;
-			requestMessage(token, std::move(done));
-		} else if (_fullId.storyId) {
-			requestStory(token, std::move(done));
-		}
 	}
-}
+	const auto channel = StatisticsRequestSender::channel();
-
+	const auto processResult = [=](const MTPstats_PublicForwards &tl) {
-void PublicForwards::requestMessage(
-		const Data::PublicForwardsSlice::OffsetToken &token,
-		Fn<void(Data::PublicForwardsSlice)> done) {
-	Expects(_fullId.messageId);
-
-	const auto offsetPeer = channel()->owner().peer(token.fullId.peer);
-	const auto tlOffsetPeer = offsetPeer
-		? offsetPeer->input
-		: MTP_inputPeerEmpty();
-	constexpr auto kLimit = tl::make_int(100);
-	_requestId = makeRequest(MTPstats_GetMessagePublicForwards(
-		channel()->inputChannel,
-		MTP_int(_fullId.messageId.msg),
-		//MTP_int(token.rate),
-		//tlOffsetPeer,
-		//MTP_int(token.fullId.msg),
-		MTP_string(), // offset
-		kLimit
-	)).done([=, channel = channel()](const MTPstats_PublicForwards &result) {
 		using Messages = QVector<Data::RecentPostId>;
 		_requestId = 0;
 
-		auto nextToken = Data::PublicForwardsSlice::OffsetToken();
+		const auto &data = tl.data();
-		const auto process = [&](const MTPVector<MTPMessage> &messages) {
-			auto result = Messages();
-			for (const auto &message : messages.v) {
-				const auto msgId = IdFromMessage(message);
-				const auto peerId = PeerFromMessage(message);
-				const auto lastDate = DateFromMessage(message);
-				if (const auto peer = channel->owner().peerLoaded(peerId)) {
-					if (lastDate) {
-						channel->owner().addNewMessage(
-							message,
-							MessageFlags(),
-							NewMessageType::Existing);
-						nextToken.fullId = { peerId, msgId };
-						result.push_back({ .messageId = nextToken.fullId });
-					}
-				}
-			}
-			return result;
-		};
-
-		auto allLoaded = false;
-		auto fullCount = 0;
-		auto messages = Messages();
-#if 0 // todo
-		auto messages = result.match([&](const MTPDmessages_messages &data) {
-			channel->owner().processUsers(data.vusers());
-			channel->owner().processChats(data.vchats());
-			auto list = process(data.vmessages());
-			allLoaded = true;
-			fullCount = list.size();
-			return list;
-		}, [&](const MTPDmessages_messagesSlice &data) {
-			channel->owner().processUsers(data.vusers());
-			channel->owner().processChats(data.vchats());
-			auto list = process(data.vmessages());
-
-			if (const auto nextRate = data.vnext_rate()) {
-				const auto rateUpdated = (nextRate->v != token.rate);
-				if (rateUpdated) {
-					nextToken.rate = nextRate->v;
-				} else {
-					allLoaded = true;
-				}
-			}
-			fullCount = data.vcount().v;
-			return list;
-		}, [&](const MTPDmessages_channelMessages &data) {
-			channel->owner().processUsers(data.vusers());
-			channel->owner().processChats(data.vchats());
-			auto list = process(data.vmessages());
-			allLoaded = true;
-			fullCount = data.vcount().v;
-			return list;
-		}, [&](const MTPDmessages_messagesNotModified &) {
-			allLoaded = true;
-			return Messages();
-		});
-#endif
-		_lastTotal = std::max(_lastTotal, fullCount);
-		done({
-			.list = std::move(messages),
-			.total = _lastTotal,
-			.allLoaded = allLoaded,
-			.token = nextToken,
-		});
-	}).fail([=] {
-		_requestId = 0;
-	}).send();
-}
-
-void PublicForwards::requestStory(
-		const Data::PublicForwardsSlice::OffsetToken &token,
-		Fn<void(Data::PublicForwardsSlice)> done) {
-	Expects(_fullId.storyId);
-
-	constexpr auto kLimit = tl::make_int(100);
-	_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
-		channel()->input,
-		MTP_int(_fullId.storyId.story),
-		MTP_string(token.storyOffset),
-		kLimit
-	)).done([=, channel = channel()](
-			const MTPstats_PublicForwards &tlForwards) {
-		using Messages = QVector<Data::RecentPostId>;
-		_requestId = 0;
-
-		const auto &data = tlForwards.data();
 		auto &owner = channel->owner();
 
 		owner.processUsers(data.vusers());
 		owner.processChats(data.vchats());
 
-		const auto nextToken = Data::PublicForwardsSlice::OffsetToken({
+		const auto nextToken = data.vnext_offset()
-			.storyOffset = data.vnext_offset().value_or_empty(),
+			? qs(*data.vnext_offset())
-		});
+			: Data::PublicForwardsSlice::OffsetToken();
 
-		const auto allLoaded = nextToken.storyOffset.isEmpty()
-			|| (nextToken.storyOffset == token.storyOffset);
 		const auto fullCount = data.vcount().v;
 
-		auto recentList = Messages();
+		auto recentList = Messages(data.vforwards().v.size());
 		for (const auto &tlForward : data.vforwards().v) {
 			tlForward.match([&](const MTPDpublicForwardMessage &data) {
 				const auto &message = data.vmessage();
@@ -520,6 +408,7 @@ void PublicForwards::requestStory(
 			});
 		}
 
+		const auto allLoaded = nextToken.isEmpty() || (nextToken == token);
 		_lastTotal = std::max(_lastTotal, fullCount);
 		done({
 			.list = std::move(recentList),
@@ -527,9 +416,24 @@ void PublicForwards::requestStory(
 			.allLoaded = allLoaded,
 			.token = nextToken,
 		});
-	}).fail([=] {
+	};
-		_requestId = 0;
+
-	}).send();
+	constexpr auto kLimit = tl::make_int(100);
+	if (_fullId.messageId) {
+		_requestId = makeRequest(MTPstats_GetMessagePublicForwards(
+			channel->inputChannel,
+			MTP_int(_fullId.messageId.msg),
+			MTP_string(token),
+			kLimit
+		)).done(processResult).fail([=] { _requestId = 0; }).send();
+	} else if (_fullId.storyId) {
+		_requestId = makeRequest(MTPstats_GetStoryPublicForwards(
+			channel->input,
+			MTP_int(_fullId.storyId.story),
+			MTP_string(token),
+			kLimit
+		)).done(processResult).fail([=] { _requestId = 0; }).send();
+	}
 }
 
 MessageStatistics::MessageStatistics(

Telegram/SourceFiles/api/api_statistics.h

@@ -77,13 +77,6 @@ public:
 		Fn<void(Data::PublicForwardsSlice)> done);
 
 private:
-	void requestMessage(
-		const Data::PublicForwardsSlice::OffsetToken &token,
-		Fn<void(Data::PublicForwardsSlice)> done);
-	void requestStory(
-		const Data::PublicForwardsSlice::OffsetToken &token,
-		Fn<void(Data::PublicForwardsSlice)> done);
-
 	const Data::RecentPostId _fullId;
 	mtpRequestId _requestId = 0;
 	int _lastTotal = 0;

Telegram/SourceFiles/data/data_statistics.h

@@ -148,11 +148,7 @@ struct RecentPostId final {
 };
 
 struct PublicForwardsSlice final {
-	struct OffsetToken final {
+	using OffsetToken = QString;
-		int rate = 0;
-		FullMsgId fullId;
-		QString storyOffset;
-	};
 	QVector<RecentPostId> list;
 	int total = 0;
 	bool allLoaded = false;

Telegram/SourceFiles/history/view/media/history_view_giveaway.h

@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_sticker.h"
+#include "ui/effects/ripple_animation.h"
 
 namespace Data {
 struct GiveawayStart;
@@ -19,10 +20,6 @@ namespace Dialogs::Stories {
 class Thumbnail;
 } // namespace Dialogs::Stories
 
-namespace Ui {
-class RippleAnimation;
-} // namespace Ui
-
 namespace HistoryView {
 
 class MediaInBubble final : public Media {

Telegram/lib_ui

@@ -1 +1 @@
-Subproject commit 06360dea67358b62e21c014c4b0d20461d752c98
+Subproject commit afe99d1e06069f522daa3a2845e22b75d3b098aa