procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Always pass all users to add group member box.

This commit is contained in:
John Preston 2017-12-08 18:25:29 +04:00
parent 90f5f7dded
commit a403ad7d37
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/info/profile/info_profile_members.cpp
View File

@ -332,17 +332,22 @@ void Members::updateHeaderControlsGeometry(int newWidth) {
} }
void Members::addMember() { void Members::addMember() {
if (auto chat = _peer->asChat()) { if (const auto chat = _peer->asChat()) {
if (chat->count >= Global::ChatSizeMax() && chat->amCreator()) { if (chat->count >= Global::ChatSizeMax() && chat->amCreator()) {
Ui::show(Box<ConvertToSupergroupBox>(chat)); Ui::show(Box<ConvertToSupergroupBox>(chat));
} else { } else {
AddParticipantsBoxController::Start(chat); AddParticipantsBoxController::Start(chat);
} }
} else if (auto channel = _peer->asChannel()) { } else if (const auto channel = _peer->asChannel()) {
if (channel->mgInfo) { const auto state = _listController->saveState();
auto &participants = channel->mgInfo->lastParticipants; const auto users = ranges::view::all(
AddParticipantsBoxController::Start(channel, { participants.cbegin(), participants.cend() }); state->list
} ) | ranges::view::transform([](not_null<PeerData*> peer) {
return peer->asUser();
});
AddParticipantsBoxController::Start(
channel,
{ users.begin(), users.end() });
} }
} }

9
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -496,13 +496,8 @@ void ShowForwardMessagesBox(
} }
void PeerMenuAddChannelMembers(not_null<ChannelData*> channel) { void PeerMenuAddChannelMembers(not_null<ChannelData*> channel) {
if (channel->isMegagroup()) { if (!channel->isMegagroup()
auto &participants = channel->mgInfo->lastParticipants; && channel->membersCount() >= Global::ChatSizeMax()) {
AddParticipantsBoxController::Start(
channel,
{ participants.cbegin(), participants.cend() });
return;
} else if (channel->membersCount() >= Global::ChatSizeMax()) {
Ui::show( Ui::show(
Box<MaxInviteBox>(channel), Box<MaxInviteBox>(channel),
LayerOption::KeepOther); LayerOption::KeepOther);