From f1f955b7aca0e1824de4451601c62f4d426f13f3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 19 Nov 2017 18:41:52 +0400 Subject: [PATCH] Pass already-members when adding members to channel. --- Telegram/SourceFiles/apiwrap.cpp | 29 +++++++ Telegram/SourceFiles/apiwrap.h | 7 ++ .../SourceFiles/boxes/add_contact_box.cpp | 1 - .../info/profile/info_profile_actions.cpp | 8 +- .../media/player/media_player_float.cpp | 11 +-- .../SourceFiles/window/window_peer_menu.cpp | 75 +++++++++++++++---- .../SourceFiles/window/window_peer_menu.h | 1 + 7 files changed, 101 insertions(+), 31 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 767da73f6..9ba8a4aa7 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -810,6 +810,35 @@ void ApiWrap::unblockParticipant(PeerData *peer, UserData *user) { } } +void ApiWrap::requestChannelMembersForAdd( + not_null channel, + base::lambda callback) { + _channelMembersForAddCallback = std::move(callback); + if (_channelMembersForAdd == channel) { + return; + } + request(base::take(_channelMembersForAddRequestId)).cancel(); + + auto requestData = MTPchannels_GetParticipants( + channel->inputChannel, + MTP_channelParticipantsRecent(), + MTP_int(0), + MTP_int(Global::ChatSizeMax())); + + _channelMembersForAdd = channel; + _channelMembersForAddRequestId = request( + std::move(requestData) + ).done([this](const MTPchannels_ChannelParticipants &result) { + base::take(_channelMembersForAddRequestId); + base::take(_channelMembersForAdd); + base::take(_channelMembersForAddCallback)(result); + }).fail([this](const RPCError &error) { + base::take(_channelMembersForAddRequestId); + base::take(_channelMembersForAdd); + base::take(_channelMembersForAddCallback); + }).send(); +} + void ApiWrap::scheduleStickerSetRequest(uint64 setId, uint64 access) { if (!_stickerSetRequests.contains(setId)) { _stickerSetRequests.insert(setId, qMakePair(access, 0)); diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 2bc283ed6..8cc9de547 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -65,6 +65,9 @@ public: void requestBots(ChannelData *channel); void requestParticipantsCountDelayed(ChannelData *channel); + void requestChannelMembersForAdd( + not_null channel, + base::lambda callback); void processFullPeer(PeerData *peer, const MTPmessages_ChatFull &result); void processFullPeer(UserData *user, const MTPUserFull &result); @@ -212,6 +215,10 @@ private: PeerRequests _botsRequests; base::DelayedCallTimer _participantsCountRequestTimer; + ChannelData *_channelMembersForAdd = nullptr; + mtpRequestId _channelMembersForAddRequestId = 0; + base::lambda _channelMembersForAddCallback; + typedef QPair KickRequest; typedef QMap KickRequests; KickRequests _kickRequests; diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index a4359560c..ab2c774c0 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -604,7 +604,6 @@ void SetupChannelBox::prepare() { AddParticipantsBoxController::Start(_channel); } }); - updateMaxHeight(); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 990f645c2..6871ff586 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -695,13 +695,7 @@ void SetupAddChannelMember( st::infoMembersAddMember); add->showOn(CanAddMemberValue(channel)); add->addClickHandler([channel] { - if (channel->membersCount() >= Global::ChatSizeMax()) { - Ui::show( - Box(channel), - LayerOption::KeepOther); - } else { - AddParticipantsBoxController::Start(channel, {}); - } + Window::PeerMenuAddChannelMembers(channel); }); parent->widthValue() | rpl::start_with_next([add](int newWidth) { diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index 6993355ea..2e04a152d 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "media/player/media_player_float.h" +#include #include "data/data_document.h" #include "history/history_media.h" #include "media/media_clip_reader.h" @@ -55,13 +56,9 @@ Float::Float( prepareShadow(); // #TODO rpl::merge - Auth().data().itemLayoutChanged() - | rpl::start_with_next([this](auto item) { - if (_item == item) { - repaintItem(); - } - }, lifetime()); - Auth().data().itemRepaintRequest() + rpl::merge( + Auth().data().itemLayoutChanged(), + Auth().data().itemRepaintRequest()) | rpl::start_with_next([this](auto item) { if (_item == item) { repaintItem(); diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 853bad9f1..705023a27 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -33,6 +33,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "styles/style_boxes.h" #include "window/window_controller.h" +#include +#include namespace Window { namespace { @@ -45,21 +47,6 @@ void AddChatMembers(not_null chat) { } } -void AddChannelMembers(not_null channel) { - if (channel->isMegagroup()) { - auto &participants = channel->mgInfo->lastParticipants; - AddParticipantsBoxController::Start( - channel, - { participants.cbegin(), participants.cend() }); - } else if (channel->membersCount() >= Global::ChatSizeMax()) { - Ui::show( - Box(channel), - LayerOption::KeepOther); - } else { - AddParticipantsBoxController::Start(channel, { }); - } -} - class Filler { public: Filler( @@ -389,7 +376,7 @@ void Filler::addChannelActions(not_null channel) { if (channel->canAddMembers()) { _addAction( lang(lng_channel_add_members), - [channel] { AddChannelMembers(channel); }); + [channel] { PeerMenuAddChannelMembers(channel); }); } } if (channel->amIn()) { @@ -499,6 +486,62 @@ void PeerMenuShareContactBox(not_null user) { })); } +void PeerMenuAddChannelMembers(not_null channel) { + if (channel->isMegagroup()) { + auto &participants = channel->mgInfo->lastParticipants; + AddParticipantsBoxController::Start( + channel, + { participants.cbegin(), participants.cend() }); + return; + } else if (channel->membersCount() >= Global::ChatSizeMax()) { + Ui::show( + Box(channel), + LayerOption::KeepOther); + return; + } + auto callback = [channel](const MTPchannels_ChannelParticipants &result) { + Expects(result.type() == mtpc_channels_channelParticipants); + + auto &participants = result.c_channels_channelParticipants(); + App::feedUsers(participants.vusers); + + auto applyToParticipant = []( + const MTPChannelParticipant &p, + auto &&method) { + switch (p.type()) { + case mtpc_channelParticipant: + return method(p.c_channelParticipant()); + case mtpc_channelParticipantSelf: + return method(p.c_channelParticipantSelf()); + case mtpc_channelParticipantAdmin: + return method(p.c_channelParticipantAdmin()); + case mtpc_channelParticipantCreator: + return method(p.c_channelParticipantCreator()); + case mtpc_channelParticipantBanned: + return method(p.c_channelParticipantBanned()); + default: Unexpected("Type in PeerMenuAddChannelMembers()"); + } + }; + + auto already = ( + participants.vparticipants.v + ) | ranges::view::transform([&](auto &&participant) { + return applyToParticipant(participant, [](auto &&data) { + return data.vuser_id.v; + }); + }) | ranges::view::transform([](UserId userId) { + return App::userLoaded(userId); + }) | ranges::view::filter([](UserData *user) { + return (user != nullptr); + }) | ranges::to_vector; + + AddParticipantsBoxController::Start( + channel, + { already.begin(), already.end() }); + }; + Auth().api().requestChannelMembersForAdd(channel, callback); +} + void FillPeerMenu( not_null controller, not_null peer, diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h index acdc15546..2e666a2bf 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.h +++ b/Telegram/SourceFiles/window/window_peer_menu.h @@ -43,5 +43,6 @@ void FillPeerMenu( void PeerMenuDeleteContact(not_null user); void PeerMenuShareContactBox(not_null user); void PeerMenuAddContact(not_null user); +void PeerMenuAddChannelMembers(not_null channel); } // namespace Window