From 5803edb77b6a81ea0acfd5d129ffcd9fba06b34e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Nov 2017 13:56:00 +0400
Subject: [PATCH] Add members from info to mgInfo->lastParticipants.

---
 Telegram/SourceFiles/apiwrap.cpp              | 22 +++++++++++++++++++
 Telegram/SourceFiles/apiwrap.h                |  5 +++++
 .../SourceFiles/info/info_layer_widget.cpp    | 12 +++++-----
 .../profile/profile_channel_controllers.cpp   | 16 +++++++++++++-
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 11a4a33cb..70108db23 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1776,6 +1776,28 @@ void ApiWrap::parseChannelParticipants(
 	}));
 };
 
+void ApiWrap::parseRecentChannelParticipants(
+		not_null<ChannelData*> channel,
+		const MTPchannels_ChannelParticipants &result,
+		base::lambda<void(int fullCount, const QVector<MTPChannelParticipant> &list)> callbackList,
+		base::lambda<void()> callbackNotModified) {
+	parseChannelParticipants(result, [&](
+			int fullCount,
+			const QVector<MTPChannelParticipant> &list) {
+		auto applyLast = channel->isMegagroup()
+			&& (channel->mgInfo->lastParticipants.size() <= list.size());
+		if (applyLast) {
+			applyLastParticipantsList(
+				channel,
+				fullCount,
+				list,
+				false,
+				true);
+		}
+		callbackList(fullCount, list);
+	}, std::move(callbackNotModified));
+}
+
 void ApiWrap::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 	switch (updates.type()) {
 	case mtpc_updateShortMessage: {
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index a87db906d..7047cf756 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -147,6 +147,11 @@ public:
 		const MTPchannels_ChannelParticipants &result,
 		base::lambda<void(int fullCount, const QVector<MTPChannelParticipant> &list)> callbackList,
 		base::lambda<void()> callbackNotModified = nullptr);
+	void parseRecentChannelParticipants(
+		not_null<ChannelData*> channel,
+		const MTPchannels_ChannelParticipants &result,
+		base::lambda<void(int fullCount, const QVector<MTPChannelParticipant> &list)> callbackList,
+		base::lambda<void()> callbackNotModified = nullptr);
 
 	~ApiWrap();
 
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 5a8435708..c900c70e1 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -133,16 +133,14 @@ int LayerWidget::resizeGetHeight(int newWidth) {
 	auto parentSize = parentWidget()->size();
 	auto windowWidth = parentSize.width();
 	auto windowHeight = parentSize.height();
-	auto newHeight = st::boxRadius + _desiredHeight + st::boxRadius;
-	if (newHeight > windowHeight || newWidth >= windowWidth) {
-		newHeight = windowHeight;
-	}
-	auto layerTop = snap(
+	auto newTop = snap(
 		windowHeight / 24,
 		st::infoLayerTopMinimal,
 		st::infoLayerTopMaximal);
+	auto newHeight = st::boxRadius + _desiredHeight + st::boxRadius;
+	accumulate_min(newHeight, windowHeight - newTop);
 
-	setRoundedCorners(layerTop + newHeight < windowHeight);
+	setRoundedCorners(newTop + newHeight < windowHeight);
 
 	// First resize content to new width and get the new desired height.
 	auto contentTop = st::boxRadius;
@@ -152,7 +150,7 @@ int LayerWidget::resizeGetHeight(int newWidth) {
 	}
 	_content->setGeometry(0, contentTop, newWidth, contentHeight);
 
-	moveToLeft((windowWidth - newWidth) / 2, layerTop);
+	moveToLeft((windowWidth - newWidth) / 2, newTop);
 
 	return newHeight;
 }
diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
index a1ec08297..52ec36fe6 100644
--- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
+++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
@@ -465,7 +465,21 @@ void ParticipantsBoxController::loadMoreRows() {
 		auto firstLoad = !_offset;
 		_loadRequestId = 0;
 
-		Auth().api().parseChannelParticipants(result, [&](
+		auto wasRecentRequest = firstLoad
+			&& (_role == Role::Members || _role == Role::Profile);
+		auto parseParticipants = [&](auto &&result, auto &&callback) {
+			if (wasRecentRequest) {
+				Auth().api().parseRecentChannelParticipants(
+					_channel,
+					result,
+					callback);
+			} else {
+				Auth().api().parseChannelParticipants(
+					result,
+					callback);
+			}
+		};
+		parseParticipants(result, [&](
 				int fullCount,
 				const QVector<MTPChannelParticipant> &list) {
 			for (auto &participant : list) {