Add other search to admin/ban/restrict in channel.

Search in chats / contacts / global in AddParticipantBoxController.
Also move all channel participants box controllers to another module.

Telegram/SourceFiles/profile/profile_channel_controllers.h

@@ -0,0 +1,220 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+In addition, as a special exception, the copyright holders give permission
+to link the code of portions of this program with the OpenSSL library.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
+*/
+#pragma once
+
+#include "boxes/peer_list_box.h"
+#include "mtproto/sender.h"
+#include "base/weak_unique_ptr.h"
+
+namespace Profile {
+
+// Viewing admins, banned or restricted users list with search.
+class ParticipantsBoxController : public PeerListController, private base::Subscriber, private MTP::Sender, public base::enable_weak_from_this {
+public:
+	enum class Role {
+		Admins,
+		Restricted,
+		Kicked,
+	};
+	static void Start(gsl::not_null<ChannelData*> channel, Role role);
+
+	struct Additional {
+		std::map<gsl::not_null<UserData*>, MTPChannelAdminRights> adminRights;
+		std::set<gsl::not_null<UserData*>> adminCanEdit;
+		std::map<gsl::not_null<UserData*>, gsl::not_null<UserData*>> adminPromotedBy;
+		std::map<gsl::not_null<UserData*>, MTPChannelBannedRights> restrictedRights;
+		std::set<gsl::not_null<UserData*>> kicked;
+		std::set<gsl::not_null<UserData*>> external;
+		std::set<gsl::not_null<UserData*>> infoNotLoaded;
+		UserData *creator = nullptr;
+	};
+
+	ParticipantsBoxController(gsl::not_null<ChannelData*> channel, Role role);
+
+	void addNewItem();
+
+	void prepare() override;
+	void rowClicked(gsl::not_null<PeerListRow*> row) override;
+	void rowActionClicked(gsl::not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+	void peerListSearchAddRow(gsl::not_null<PeerData*> peer) override;
+	std::unique_ptr<PeerListRow> createSearchRow(gsl::not_null<PeerData*> peer) override;
+
+	// Callback(gsl::not_null<UserData*>)
+	template <typename Callback>
+	static void HandleParticipant(const MTPChannelParticipant &participant, Role role, gsl::not_null<Additional*> additional, Callback callback);
+
+private:
+	void editAdmin(gsl::not_null<UserData*> user);
+	void editAdminDone(gsl::not_null<UserData*> user, const MTPChannelAdminRights &rights);
+	void editRestricted(gsl::not_null<UserData*> user);
+	void editRestrictedDone(gsl::not_null<UserData*> user, const MTPChannelBannedRights &rights);
+	void removeKicked(gsl::not_null<PeerListRow*> row, gsl::not_null<UserData*> user);
+	bool appendRow(gsl::not_null<UserData*> user);
+	bool prependRow(gsl::not_null<UserData*> user);
+	std::unique_ptr<PeerListRow> createRow(gsl::not_null<UserData*> user) const;
+
+	gsl::not_null<ChannelData*> _channel;
+	Role _role = Role::Admins;
+	int _offset = 0;
+	mtpRequestId _loadRequestId = 0;
+	bool _allLoaded = false;
+	Additional _additional;
+	QPointer<BoxContent> _editBox;
+	QPointer<PeerListBox> _addBox;
+
+};
+
+// Banned and restricted users server side search.
+class BannedBoxSearchController : public PeerListSearchController, private MTP::Sender {
+public:
+	using Role = ParticipantsBoxController::Role;
+	using Additional = ParticipantsBoxController::Additional;
+
+	BannedBoxSearchController(gsl::not_null<ChannelData*> channel, Role role, gsl::not_null<Additional*> additional);
+
+	void searchQuery(const QString &query) override;
+	bool isLoading() override;
+	bool loadMoreRows() override;
+
+private:
+	struct CacheEntry {
+		MTPchannels_ChannelParticipants result;
+		int requestedCount = 0;
+	};
+	struct Query {
+		QString text;
+		int offset = 0;
+	};
+
+	void searchOnServer();
+	bool searchInCache();
+	void searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount);
+
+	gsl::not_null<ChannelData*> _channel;
+	Role _role = Role::Restricted;
+	gsl::not_null<Additional*> _additional;
+
+	base::Timer _timer;
+	QString _query;
+	mtpRequestId _requestId = 0;
+	int _offset = 0;
+	bool _allLoaded = false;
+	std::map<QString, CacheEntry> _cache;
+	std::map<mtpRequestId, Query> _queries;
+
+};
+
+// Adding an admin, banned or restricted user from channel members with search + contacts search + global search.
+class AddParticipantBoxController : public PeerListController, private base::Subscriber, private MTP::Sender, public base::enable_weak_from_this {
+public:
+	using Role = ParticipantsBoxController::Role;
+	using Additional = ParticipantsBoxController::Additional;
+
+	AddParticipantBoxController(gsl::not_null<ChannelData*> channel, Role role, base::lambda<void()> doneCallback);
+
+	void prepare() override;
+	void rowClicked(gsl::not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+	void peerListSearchAddRow(gsl::not_null<PeerData*> peer) override;
+	std::unique_ptr<PeerListRow> createSearchRow(gsl::not_null<PeerData*> peer) override;
+
+	// Callback(gsl::not_null<UserData*>)
+	template <typename Callback>
+	static void HandleParticipant(const MTPChannelParticipant &participant, gsl::not_null<Additional*> additional, Callback callback);
+
+private:
+	template <typename Callback>
+	bool checkInfoLoaded(gsl::not_null<UserData*> user, Callback callback);
+
+	void editAdmin(gsl::not_null<UserData*> user, bool sure = false);
+	void editAdminDone(gsl::not_null<UserData*> user, const MTPChannelAdminRights &rights);
+	void editRestricted(gsl::not_null<UserData*> user, bool sure = false);
+	void editRestrictedDone(gsl::not_null<UserData*> user, const MTPChannelBannedRights &rights);
+	void kickUser(gsl::not_null<UserData*> user, bool sure = false);
+	void restrictUserSure(gsl::not_null<UserData*> user, const MTPChannelBannedRights &rights);
+	bool appendRow(gsl::not_null<UserData*> user);
+	bool prependRow(gsl::not_null<UserData*> user);
+	std::unique_ptr<PeerListRow> createRow(gsl::not_null<UserData*> user) const;
+
+	gsl::not_null<ChannelData*> _channel;
+	Role _role = Role::Admins;
+	int _offset = 0;
+	mtpRequestId _loadRequestId = 0;
+	bool _allLoaded = false;
+	Additional _additional;
+	QPointer<BoxContent> _editBox;
+	base::lambda<void()> _doneCallback;
+
+};
+
+// Finds channel members, then contacts, then global search results.
+class AddParticipantBoxSearchController : public PeerListSearchController, private MTP::Sender {
+public:
+	using Role = ParticipantsBoxController::Role;
+	using Additional = ParticipantsBoxController::Additional;
+
+	AddParticipantBoxSearchController(gsl::not_null<ChannelData*> channel, Role role, gsl::not_null<Additional*> additional);
+
+	void searchQuery(const QString &query) override;
+	bool isLoading() override;
+	bool loadMoreRows() override;
+
+private:
+	struct CacheEntry {
+		MTPchannels_ChannelParticipants result;
+		int requestedCount = 0;
+	};
+	struct Query {
+		QString text;
+		int offset = 0;
+	};
+
+	void searchOnServer();
+	bool searchParticipantsInCache();
+	void searchParticipantsDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount);
+	bool searchGlobalInCache();
+	void searchGlobalDone(mtpRequestId requestId, const MTPcontacts_Found &result);
+	void requestParticipants();
+	void addChatsContacts();
+	void requestGlobal();
+
+	gsl::not_null<ChannelData*> _channel;
+	Role _role = Role::Admins;
+	gsl::not_null<Additional*> _additional;
+
+	base::Timer _timer;
+	QString _query;
+	mtpRequestId _requestId = 0;
+	int _offset = 0;
+	bool _participantsLoaded = false;
+	bool _chatsContactsAdded = false;
+	bool _globalLoaded = false;
+	std::map<QString, CacheEntry> _participantsCache;
+	std::map<mtpRequestId, Query> _participantsQueries;
+	std::map<QString, MTPcontacts_Found> _globalCache;
+	std::map<mtpRequestId, QString> _globalQueries;
+
+};
+
+} // namespace Profile

Telegram/gyp/telegram_sources.txt

@@ -345,6 +345,8 @@
 <(src_loc)/profile/profile_block_shared_media.h
 <(src_loc)/profile/profile_block_widget.cpp
 <(src_loc)/profile/profile_block_widget.h
+<(src_loc)/profile/profile_channel_controllers.cpp
+<(src_loc)/profile/profile_channel_controllers.h
 <(src_loc)/profile/profile_common_groups_section.cpp
 <(src_loc)/profile/profile_common_groups_section.h
 <(src_loc)/profile/profile_cover_drop_area.cpp