From a403ad7d377c7a23e92c875fc280b65fe9648569 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Dec 2017 18:25:29 +0400
Subject: [PATCH] Always pass all users to add group member box.

---
 .../info/profile/info_profile_members.cpp       | 17 +++++++++++------
 .../SourceFiles/window/window_peer_menu.cpp     |  9 ++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index b358c9d31..3507757f7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -332,17 +332,22 @@ void Members::updateHeaderControlsGeometry(int newWidth) {
 }
 
 void Members::addMember() {
-	if (auto chat = _peer->asChat()) {
+	if (const auto chat = _peer->asChat()) {
 		if (chat->count >= Global::ChatSizeMax() && chat->amCreator()) {
 			Ui::show(Box<ConvertToSupergroupBox>(chat));
 		} else {
 			AddParticipantsBoxController::Start(chat);
 		}
-	} else if (auto channel = _peer->asChannel()) {
-		if (channel->mgInfo) {
-			auto &participants = channel->mgInfo->lastParticipants;
-			AddParticipantsBoxController::Start(channel, { participants.cbegin(), participants.cend() });
-		}
+	} else if (const auto channel = _peer->asChannel()) {
+		const auto state = _listController->saveState();
+		const auto users = ranges::view::all(
+			state->list
+		) | ranges::view::transform([](not_null<PeerData*> peer) {
+			return peer->asUser();
+		});
+		AddParticipantsBoxController::Start(
+			channel,
+			{ users.begin(), users.end() });
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 6a583c639..3a2d5738a 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -496,13 +496,8 @@ void ShowForwardMessagesBox(
 }
 
 void PeerMenuAddChannelMembers(not_null<ChannelData*> channel) {
-	if (channel->isMegagroup()) {
-		auto &participants = channel->mgInfo->lastParticipants;
-		AddParticipantsBoxController::Start(
-			channel,
-			{ participants.cbegin(), participants.cend() });
-		return;
-	} else if (channel->membersCount() >= Global::ChatSizeMax()) {
+	if (!channel->isMegagroup()
+		&& channel->membersCount() >= Global::ChatSizeMax()) {
 		Ui::show(
 			Box<MaxInviteBox>(channel),
 			LayerOption::KeepOther);