From 21f4bbbe7b414fe04d0deb40abc76e1f5c016b23 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 26 Dec 2017 19:12:10 +0300 Subject: [PATCH] Update kicked count in Channel Info box. --- Telegram/SourceFiles/apiwrap.cpp | 88 +++++++++++-------- Telegram/SourceFiles/apiwrap.h | 17 ++-- Telegram/SourceFiles/boxes/confirm_box.cpp | 15 +++- Telegram/SourceFiles/data/data_peer.cpp | 9 +- .../info_profile_members_controllers.cpp | 3 +- Telegram/SourceFiles/mainwidget.cpp | 15 ---- Telegram/SourceFiles/mainwidget.h | 3 - .../profile/profile_block_group_members.cpp | 13 ++- .../profile/profile_channel_controllers.cpp | 8 +- .../profile/profile_channel_controllers.h | 8 +- 10 files changed, 106 insertions(+), 73 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index eb71c2453..24446afca 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -937,47 +937,65 @@ void ApiWrap::requestSelfParticipant(ChannelData *channel) { _selfParticipantRequests.insert(channel, requestId); } -void ApiWrap::kickParticipant(PeerData *peer, UserData *user, const MTPChannelBannedRights ¤tRights) { - auto kick = KickRequest(peer, user); - if (_kickRequests.contains(kick)) return; - - if (auto channel = peer->asChannel()) { - auto rights = ChannelData::KickedRestrictedRights(); - auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser, rights)).done([this, channel, user, currentRights, rights](const MTPUpdates &result) { - applyUpdates(result); - - _kickRequests.remove(KickRequest(channel, user)); - channel->applyEditBanned(user, currentRights, rights); - }).fail([this, kick](const RPCError &error) { - _kickRequests.remove(kick); - }).send(); - - _kickRequests.insert(kick, requestId); - } +void ApiWrap::kickParticipant( + not_null chat, + not_null user) { + request(MTPmessages_DeleteChatUser( + chat->inputChat, + user->inputUser + )).done([=](const MTPUpdates &result) { + applyUpdates(result); + }).send(); } -void ApiWrap::unblockParticipant(PeerData *peer, UserData *user) { - auto kick = KickRequest(peer, user); +void ApiWrap::kickParticipant( + not_null channel, + not_null user, + const MTPChannelBannedRights ¤tRights) { + const auto kick = KickRequest(channel, user); if (_kickRequests.contains(kick)) return; - if (auto channel = peer->asChannel()) { - auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)))).done([this, peer, user](const MTPUpdates &result) { - applyUpdates(result); + const auto rights = ChannelData::KickedRestrictedRights(); + const auto requestId = request(MTPchannels_EditBanned( + channel->inputChannel, + user->inputUser, + rights + )).done([=](const MTPUpdates &result) { + applyUpdates(result); - _kickRequests.remove(KickRequest(peer, user)); - if (auto channel = peer->asMegagroup()) { - if (channel->kickedCount() > 0) { - channel->setKickedCount(channel->kickedCount() - 1); - } else { - channel->updateFullForced(); - } - } - }).fail([this, kick](const RPCError &error) { - _kickRequests.remove(kick); - }).send(); + _kickRequests.remove(KickRequest(channel, user)); + channel->applyEditBanned(user, currentRights, rights); + }).fail([this, kick](const RPCError &error) { + _kickRequests.remove(kick); + }).send(); - _kickRequests.insert(kick, requestId); - } + _kickRequests.emplace(kick, requestId); +} + +void ApiWrap::unblockParticipant( + not_null channel, + not_null user) { + const auto kick = KickRequest(channel, user); + if (_kickRequests.contains(kick)) return; + + const auto requestId = request(MTPchannels_EditBanned( + channel->inputChannel, + user->inputUser, + MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) + )).done([=](const MTPUpdates &result) { + applyUpdates(result); + + _kickRequests.remove(KickRequest(channel, user)); + if (channel->kickedCount() > 0) { + channel->setKickedCount(channel->kickedCount() - 1); + } else { + channel->updateFullForced(); + } + }).fail([this, kick](const RPCError &error) { + _kickRequests.remove(kick); + }).send(); + + _kickRequests.emplace(kick, requestId); } void ApiWrap::requestChannelMembersForAdd( diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 8e3ac88ec..7df05faf0 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -77,8 +77,14 @@ public: void processFullPeer(UserData *user, const MTPUserFull &result); void requestSelfParticipant(ChannelData *channel); - void kickParticipant(PeerData *peer, UserData *user, const MTPChannelBannedRights ¤tRights); - void unblockParticipant(PeerData *peer, UserData *user); + void kickParticipant(not_null chat, not_null user); + void kickParticipant( + not_null channel, + not_null user, + const MTPChannelBannedRights ¤tRights); + void unblockParticipant( + not_null channel, + not_null user); void requestWebPageDelayed(WebPageData *page); void clearWebPageRequest(WebPageData *page); @@ -357,9 +363,10 @@ private: mtpRequestId _channelMembersForAddRequestId = 0; base::lambda _channelMembersForAddCallback; - typedef QPair KickRequest; - typedef QMap KickRequests; - KickRequests _kickRequests; + using KickRequest = std::pair< + not_null, + not_null>; + base::flat_map _kickRequests; QMap _selfParticipantRequests; diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index e6701e6d7..ef2c5af24 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp @@ -565,13 +565,22 @@ void DeleteMessagesBox::deleteAndClear() { if (_moderateFrom) { if (_banUser && _banUser->checked()) { - Auth().api().kickParticipant(_moderateInChannel, _moderateFrom, MTP_channelBannedRights(MTP_flags(0), MTP_int(0))); + Auth().api().kickParticipant( + _moderateInChannel, + _moderateFrom, + MTP_channelBannedRights(MTP_flags(0), MTP_int(0))); } if (_reportSpam->checked()) { - MTP::send(MTPchannels_ReportSpam(_moderateInChannel->inputChannel, _moderateFrom->inputUser, MTP_vector(1, MTP_int(_ids[0].msg)))); + MTP::send( + MTPchannels_ReportSpam( + _moderateInChannel->inputChannel, + _moderateFrom->inputUser, + MTP_vector(1, MTP_int(_ids[0].msg)))); } if (_deleteAll && _deleteAll->checked()) { - App::main()->deleteAllFromUser(_moderateInChannel, _moderateFrom); + App::main()->deleteAllFromUser( + _moderateInChannel, + _moderateFrom); } } diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp index 5e7bc8840..d46d228c5 100644 --- a/Telegram/SourceFiles/data/data_peer.cpp +++ b/Telegram/SourceFiles/data/data_peer.cpp @@ -794,9 +794,12 @@ void ChannelData::applyEditBanned(not_null user, const MTPChannelBann } Data::ChannelAdminChanges(this).feed(peerToUser(user->id), false); } else { - if (isKicked && membersCount() > 1) { - setMembersCount(membersCount() - 1); - flags |= Notify::PeerUpdate::Flag::MembersChanged; + if (isKicked) { + if (membersCount() > 1) { + setMembersCount(membersCount() - 1); + flags |= Notify::PeerUpdate::Flag::MembersChanged; + } + setKickedCount(kickedCount() + 1); } } Notify::peerUpdatedDelayed(this, flags); diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index 1c4466e94..51a9e549a 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -309,7 +309,8 @@ void ChatMembersController::removeMember(not_null user) { auto text = lng_profile_sure_kick(lt_user, user->firstName); Ui::show(Box(text, lang(lng_box_remove), [user, chat = _chat] { Ui::hideLayer(); - if (App::main()) App::main()->kickParticipant(chat, user); + Auth().api().kickParticipant(chat, user); + Ui::showPeerHistory(chat->id, ShowAtTheEndMsgId); })); } diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index f6357c327..156646537 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1268,21 +1268,6 @@ bool MainWidget::addParticipantsFail( return false; } -void MainWidget::kickParticipant(ChatData *chat, UserData *user) { - MTP::send( - MTPmessages_DeleteChatUser(chat->inputChat, user->inputUser), - rpcDone(&MainWidget::sentUpdatesReceived), - rpcFail(&MainWidget::kickParticipantFail, chat)); - Ui::showPeerHistory(chat->id, ShowAtTheEndMsgId); -} - -bool MainWidget::kickParticipantFail(ChatData *chat, const RPCError &error) { - if (MTP::isDefaultHandledError(error)) return false; - - error.type(); - return false; -} - void MainWidget::checkPeerHistory(PeerData *peer) { auto offsetId = 0; auto offsetDate = 0; diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 22585fcda..a49b411bb 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -224,9 +224,6 @@ public: not_null channel, const RPCError &e); // for multi invite in channels - void kickParticipant(ChatData *chat, UserData *user); - bool kickParticipantFail(ChatData *chat, const RPCError &e); - void checkPeerHistory(PeerData *peer); void checkedHistory(PeerData *peer, const MTPmessages_Messages &result); diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp index 5cd0f5d6d..b6f19f644 100644 --- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp +++ b/Telegram/SourceFiles/profile/profile_block_group_members.cpp @@ -116,6 +116,7 @@ void GroupMembersWidget::restrictUser(not_null user) { void GroupMembersWidget::removePeer(PeerData *selectedPeer) { auto user = selectedPeer->asUser(); Assert(user != nullptr); + auto text = lng_profile_sure_kick(lt_user, user->firstName); auto currentRestrictedRights = [&]() -> MTPChannelBannedRights { if (auto channel = peer()->asMegagroup()) { @@ -128,10 +129,14 @@ void GroupMembersWidget::removePeer(PeerData *selectedPeer) { }(); Ui::show(Box(text, lang(lng_box_remove), [user, currentRestrictedRights, peer = peer()] { Ui::hideLayer(); - if (auto chat = peer->asChat()) { - if (App::main()) App::main()->kickParticipant(chat, user); - } else if (auto channel = peer->asChannel()) { - Auth().api().kickParticipant(channel, user, currentRestrictedRights); + if (const auto chat = peer->asChat()) { + Auth().api().kickParticipant(chat, user); + Ui::showPeerHistory(chat->id, ShowAtTheEndMsgId); + } else if (const auto channel = peer->asChannel()) { + Auth().api().kickParticipant( + channel, + user, + currentRestrictedRights); } })); } diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index 3d4aa9105..b8511697c 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -860,7 +860,9 @@ void ParticipantsBoxController::kickMemberSure(not_null user) { _editBox->closeBox(); } auto alreadyIt = _additional.restrictedRights.find(user); - auto currentRights = (alreadyIt == _additional.restrictedRights.cend()) ? MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) : alreadyIt->second; + auto currentRights = (alreadyIt == _additional.restrictedRights.cend()) + ? MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) + : alreadyIt->second; if (auto row = delegate()->peerListFindRow(user->id)) { delegate()->peerListRemoveRow(row); @@ -899,7 +901,9 @@ void ParticipantsBoxController::removeAdminSure(not_null user) { }); } -void ParticipantsBoxController::removeKicked(not_null row, not_null user) { +void ParticipantsBoxController::removeKicked( + not_null row, + not_null user) { delegate()->peerListRemoveRow(row); delegate()->peerListRefreshRows(); diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h index 3117f31f3..f4526821c 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.h +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h @@ -124,9 +124,13 @@ private: void sortByOnlineDelayed(); void sortByOnline(); void showAdmin(not_null user); - void editAdminDone(not_null user, const MTPChannelAdminRights &rights); + void editAdminDone( + not_null user, + const MTPChannelAdminRights &rights); void showRestricted(not_null user); - void editRestrictedDone(not_null user, const MTPChannelBannedRights &rights); + void editRestrictedDone( + not_null user, + const MTPChannelBannedRights &rights); void removeKicked(not_null row, not_null user); void kickMember(not_null user); void kickMemberSure(not_null user);