Allow fast admin removing in supergroups/channels.

Telegram/Resources/langs/lang.strings

@@ -577,6 +577,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 "lng_profile_kick" = "Remove";
 "lng_profile_sure_kick" = "Remove {user} from the group?";
 "lng_profile_sure_kick_channel" = "Remove {user} from the channel?";
+"lng_profile_sure_remove_admin" = "Remove {user} from group admins?";
+"lng_profile_sure_remove_admin_channel" = "Remove {user} from channel admins?";
 "lng_profile_loading" = "Loading...";
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
@@ -697,6 +699,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 "lng_channel_banned_status_restricted_by" = "Restricted by {user}";
 
 "lng_group_blocked_list_about" = "Banned users are removed from the group and can only come back if invited by an admin.\nInvite links don't work for them.";
+"lng_channel_blocked_list_about" = "Banned users are removed from the channel.\nInvite links don't work for them.";
 
 "lng_chat_all_members_admins" = "All Members Are Admins";
 "lng_chat_about_all_admins" = "Group members can add new members, edit name and photo of the group.";

Telegram/SourceFiles/profile/profile_channel_controllers.cpp

@@ -43,6 +43,25 @@ constexpr auto kParticipantsFirstPageCount = 16;
 constexpr auto kParticipantsPerPage = 200;
 constexpr auto kSortByOnlineDelay = TimeMs(1000);
 
+void RemoveAdmin(
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user,
+		const MTPChannelAdminRights &oldRights,
+		base::lambda<void()> onDone) {
+	const auto newRights = MTP_channelAdminRights(MTP_flags(0));
+	auto done = [=](const MTPUpdates &result) {
+		Auth().api().applyUpdates(result);
+		channel->applyEditAdmin(user, oldRights, newRights);
+		onDone();
+	};
+	MTP::send(
+		MTPchannels_EditAdmin(
+			channel->inputChannel,
+			user->inputUser,
+			newRights),
+		rpcDone(std::move(done)));
+}
+
 } // namespace
 
 ParticipantsBoxController::ParticipantsBoxController(
@@ -516,7 +535,9 @@ void ParticipantsBoxController::loadMoreRows() {
 
 void ParticipantsBoxController::setNonEmptyDescription() {
 	setDescriptionText((_role == Role::Kicked)
-		? lang(lng_group_blocked_list_about)
+		? lang(_channel->isMegagroup()
+			? lng_group_blocked_list_about
+			: lng_channel_blocked_list_about)
 		: QString());
 }
 
@@ -601,7 +622,7 @@ void ParticipantsBoxController::rowActionClicked(not_null<PeerListRow*> row) {
 	if (_role == Role::Members || _role == Role::Profile) {
 		kickMember(user);
 	} else if (_role == Role::Admins) {
-		showAdmin(user);
+		removeAdmin(user);
 	} else if (_role == Role::Restricted) {
 		showRestricted(user);
 	} else {
@@ -848,6 +869,36 @@ void ParticipantsBoxController::kickMemberSure(not_null<UserData*> user) {
 	Auth().api().kickParticipant(_channel, user, currentRights);
 }
 
+void ParticipantsBoxController::removeAdmin(not_null<UserData*> user) {
+	const auto phrase = _channel->isMegagroup()
+		? lng_profile_sure_remove_admin
+		: lng_profile_sure_remove_admin_channel;
+	const auto text = phrase(lt_user, user->firstName);
+	const auto weak = base::make_weak(this);
+	_editBox = Ui::show(Box<ConfirmBox>(text, lang(lng_box_remove), [=] {
+		if (const auto strong = weak.get()) {
+			strong->removeAdminSure(user);
+		}
+	}), LayerOption::KeepOther);
+}
+
+void ParticipantsBoxController::removeAdminSure(not_null<UserData*> user) {
+	if (_editBox) {
+		_editBox->closeBox();
+	}
+	const auto oldRightsIt = _additional.adminRights.find(user);
+	if (oldRightsIt == _additional.adminRights.cend()) {
+		return;
+	}
+	const auto weak = base::make_weak(this);
+	RemoveAdmin(_channel, user, oldRightsIt->second, [=] {
+		if (const auto strong = weak.get()) {
+			const auto newRights = MTP_channelAdminRights(MTP_flags(0));
+			strong->editAdminDone(user, newRights);
+		}
+	});
+}
+
 void ParticipantsBoxController::removeKicked(not_null<PeerListRow*> row, not_null<UserData*> user) {
 	delegate()->peerListRemoveRow(row);
 	delegate()->peerListRefreshRows();
@@ -909,7 +960,15 @@ std::unique_ptr<PeerListRow> ParticipantsBoxController::createRow(
 	}
 	auto row = std::make_unique<PeerListRowWithLink>(user);
 	refreshCustomStatus(row.get());
-	if (_role == Role::Restricted || (_role == Role::Admins && _additional.adminCanEdit.find(user) != _additional.adminCanEdit.cend())) {
+	if (_role == Role::Admins
+		&& canEditAdminByRights(user)
+		&& _additional.adminRights.find(user)
+			!= _additional.adminRights.cend()) {
+		row->setActionLink(lang(lng_profile_kick));
+	} else if (_role == Role::Restricted
+		|| (_role == Role::Admins
+			&& _additional.adminCanEdit.find(user)
+				!= _additional.adminCanEdit.cend())) {
 //		row->setActionLink(lang(lng_profile_edit_permissions));
 	} else if (_role == Role::Kicked) {
 		row->setActionLink(lang(lng_blocked_list_unblock));

Telegram/SourceFiles/profile/profile_channel_controllers.h

@@ -130,6 +130,8 @@ private:
 	void removeKicked(not_null<PeerListRow*> row, not_null<UserData*> user);
 	void kickMember(not_null<UserData*> user);
 	void kickMemberSure(not_null<UserData*> user);
+	void removeAdmin(not_null<UserData*> user);
+	void removeAdminSure(not_null<UserData*> user);
 	bool appendRow(not_null<UserData*> user);
 	bool prependRow(not_null<UserData*> user);
 	bool removeRow(not_null<UserData*> user);