Add sticker sets search.

Telegram/Resources/langs/lang.strings

@@ -926,6 +926,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stickers_remove_group_set" = "Remove group sticker set?";
 "lng_stickers_group_from_your" = "Choose from your stickers";
 "lng_stickers_group_from_featured" = "Choose from trending stickers";
+"lng_stickers_search_sets" = "Search sticker sets";
+"lng_stickers_nothing_found" = "No stickers found";
 
 "lng_in_dlg_photo" = "Photo";
 "lng_in_dlg_album" = "Album";

Telegram/Resources/scheme.tl

@@ -957,7 +957,7 @@ dialogPeer#e56dbf05 peer:Peer = DialogPeer;
 dialogPeerFeed#da429411 feed_id:int = DialogPeer;
 
 messages.foundStickerSetsNotModified#d54b65d = messages.FoundStickerSets;
-messages.foundStickerSets#b35bcea9 hash:int sets:Vector<StickerSet> = messages.FoundStickerSets;
+messages.foundStickerSets#5108d648 hash:int sets:Vector<StickerSetCovered> = messages.FoundStickerSets;
 
 feedPosition#5059dc73 date:int peer:Peer id:int = FeedPosition;
 

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -568,6 +568,7 @@ PeerListContent::PeerListContent(
 
 void PeerListContent::appendRow(std::unique_ptr<PeerListRow> row) {
 	Expects(row != nullptr);
+
 	if (_rowsById.find(row->id()) == _rowsById.cend()) {
 		row->setAbsoluteIndex(_rows.size());
 		addRowEntry(row.get());
@@ -578,6 +579,7 @@ void PeerListContent::appendRow(std::unique_ptr<PeerListRow> row) {
 void PeerListContent::appendSearchRow(std::unique_ptr<PeerListRow> row) {
 	Expects(row != nullptr);
 	Expects(showingSearch());
+
 	if (_rowsById.find(row->id()) == _rowsById.cend()) {
 		row->setAbsoluteIndex(_searchRows.size());
 		row->setIsSearchResult(true);
@@ -589,13 +591,17 @@ void PeerListContent::appendSearchRow(std::unique_ptr<PeerListRow> row) {
 
 void PeerListContent::appendFoundRow(not_null<PeerListRow*> row) {
 	Expects(showingSearch());
+
 	auto index = findRowIndex(row);
 	if (index.value < 0) {
 		_filterResults.push_back(row);
 	}
 }
 
-void PeerListContent::changeCheckState(not_null<PeerListRow*> row, bool checked, PeerListRow::SetStyle style) {
+void PeerListContent::changeCheckState(
+		not_null<PeerListRow*> row,
+		bool checked,
+		PeerListRow::SetStyle style) {
 	row->setChecked(
 		checked,
 		style,

Telegram/SourceFiles/boxes/stickers_box.cpp

@@ -163,8 +163,7 @@ void StickersBox::getArchivedDone(uint64 offsetId, const MTPmessages_ArchivedSti
 
 	auto addedSet = false;
 	auto changedSets = false;
-	auto &v = stickers.vsets.v;
+	for_const (const auto &stickerSet, stickers.vsets.v) {
-	for_const (auto &stickerSet, v) {
 		const MTPDstickerSet *setData = nullptr;
 		switch (stickerSet.type()) {
 		case mtpc_stickerSetCovered: {
@@ -202,7 +201,8 @@ void StickersBox::getArchivedDone(uint64 offsetId, const MTPmessages_ArchivedSti
 	if (addedSet) {
 		_archived.widget()->updateSize();
 	} else {
-		_allArchivedLoaded = v.isEmpty() || (!changedSets && offsetId != 0);
+		_allArchivedLoaded = stickers.vsets.v.isEmpty()
+			|| (!changedSets && offsetId != 0);
 		if (changedSets) {
 			loadMoreArchived();
 		}

Telegram/SourceFiles/chat_helpers/chat_helpers.style

@@ -21,17 +21,17 @@ stickersRestrictedLabel: FlatLabel(defaultFlatLabel) {
 	textFg: noContactsColor;
 }
 
-stickersTrendingHeader: 45px;
+stickersTrendingHeader: 56px;
-stickersTrendingSkip: 15px;
+stickersTrendingSkip: 4px;
 
 stickersTrendingHeaderFont: semiboldFont;
 stickersTrendingHeaderFg: windowFg;
-stickersTrendingHeaderTop: 0px;
+stickersTrendingHeaderTop: 11px;
 stickersTrendingSubheaderFont: normalFont;
 stickersTrendingSubheaderFg: windowSubTextFg;
-stickersTrendingSubheaderTop: 20px;
+stickersTrendingSubheaderTop: 31px;
 
-stickersTrendingAddTop: 3px;
+stickersTrendingAddTop: 14px;
 stickersTrendingAdd: RoundButton(defaultActiveButton) {
 	width: -16px;
 	height: 26px;
@@ -91,6 +91,7 @@ stickersRowDuration: 200;
 stickersSettings: icon {{ "emoji_settings", emojiIconFg }};
 stickersTrending: icon {{ "emoji_trending", emojiIconFg }};
 stickersFaved: icon {{ "emoji_faved", emojiIconFg }};
+stickersSearch: icon {{ "title_search", emojiIconFg, point(0px, 5px) }};
 
 stickersSettingsUnreadSize: 17px;
 stickersSettingsUnreadPosition: point(4px, 5px);
@@ -209,6 +210,8 @@ stickerGroupCategoryAdd: stickersTrendingAdd;
 stickersToastMaxWidth: 340px;
 stickersToastPadding: margins(16px, 13px, 16px, 12px);
 
+stickersEmpty: icon {{ "stickers_empty", windowSubTextFg }};
+
 inlineBotsScroll: ScrollArea(defaultSolidScroll) {
 	deltat: stickerPanPadding;
 	deltab: stickerPanPadding;

Telegram/SourceFiles/chat_helpers/stickers.cpp

@@ -744,7 +744,11 @@ Set *FeedSet(const MTPDstickerSet &set) {
 		it->title = title;
 		it->shortName = qs(set.vshort_name);
 		flags = it->flags;
-		auto clientFlags = it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_unread | MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_special);
+		auto clientFlags = it->flags
+			& (MTPDstickerSet_ClientFlag::f_featured
+				| MTPDstickerSet_ClientFlag::f_unread
+				| MTPDstickerSet_ClientFlag::f_not_loaded
+				| MTPDstickerSet_ClientFlag::f_special);
 		it->flags = set.vflags.v | clientFlags;
 		it->installDate = set.has_installed_date()
 			? set.vinstalled_date.v

Telegram/SourceFiles/chat_helpers/stickers.h

@@ -52,6 +52,7 @@ struct Set {
 	MTPDstickerSet::Flags flags;
 	TimeId installDate = 0;
 	Pack stickers;
+	Pack covers;
 	ByEmojiMap emoji;
 };
 using Sets = QMap<uint64, Set>;

Telegram/SourceFiles/chat_helpers/stickers_list_widget.h

@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/tabbed_selector.h"
 #include "chat_helpers/stickers.h"
 #include "base/variant.h"
+#include "base/timer.h"
 
 namespace Window {
 class Controller;
@@ -31,7 +32,9 @@ class StickersListWidget
 	Q_OBJECT
 
 public:
-	StickersListWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	StickersListWidget(
+		QWidget *parent,
+		not_null<Window::Controller*> controller);
 
 	void refreshRecent() override;
 	void preloadImages() override;
@@ -41,6 +44,9 @@ public:
 	void showStickerSet(uint64 setId);
 	void showMegagroupSet(ChannelData *megagroup);
 
+	void afterShown() override;
+	void beforeHiding() override;
+
 	void refreshStickers();
 
 	void fillIcons(QList<StickerIcon> &icons);
@@ -52,6 +58,9 @@ public:
 	void notInstalledLocally(uint64 setId);
 	void clearInstalledLocally();
 
+	void sendSearchRequest();
+	void searchForSets(const QString &query);
+
 	~StickersListWidget();
 
 protected:
@@ -88,6 +97,7 @@ private:
 	enum class Section {
 		Featured,
 		Stickers,
+		Search,
 	};
 
 	struct OverSticker {
@@ -131,17 +141,18 @@ private:
 			uint64 id,
 			MTPDstickerSet::Flags flags,
 			const QString &title,
-			int hoversSize,
+			bool externalLayout,
 			const Stickers::Pack &pack = Stickers::Pack());
 		Set(Set &&other);
 		Set &operator=(Set &&other);
 		~Set();
 
-		uint64 id;
+		uint64 id = 0;
-		MTPDstickerSet::Flags flags;
+		MTPDstickerSet::Flags flags = MTPDstickerSet::Flags();
 		QString title;
 		Stickers::Pack pack;
 		std::unique_ptr<Ui::RippleAnimation> ripple;
+		bool externalLayout = false;
 	};
 
 	template <typename Callback>
@@ -153,6 +164,11 @@ private:
 	void installSet(uint64 setId);
 	void removeMegagroupSet(bool locally);
 	void removeSet(uint64 setId);
+	void sendInstallRequest(
+		uint64 setId,
+		const MTPInputStickerSet &input);
+	void refreshSearchSets();
+	void refreshSearchIndex();
 
 	bool setHasTitle(const Set &set) const;
 	bool stickerHasDeleteButton(const Set &set, int index) const;
@@ -178,12 +194,8 @@ private:
 	};
 	void validateSelectedIcon(ValidateIconAnimations animations);
 
-	std::vector<Set> &shownSets() {
+	std::vector<Set> &shownSets();
-		return (_section == Section::Featured) ? _featuredSets : _mySets;
+	const std::vector<Set> &shownSets() const;
-	}
-	const std::vector<Set> &shownSets() const {
-		return (_section == Section::Featured) ? _featuredSets : _mySets;
-	}
 	int featuredRowHeight() const;
 	void readVisibleSets();
 
@@ -191,6 +203,7 @@ private:
 	void paintStickers(Painter &p, QRect clip);
 	void paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected, TimeMs ms);
 	void paintSticker(Painter &p, Set &set, int y, int index, bool selected, bool deleteSelected);
+	void paintEmptySearchResults(Painter &p);
 
 	int stickersRight() const;
 	bool featuredHasAddButton(int index) const;
@@ -209,6 +222,7 @@ private:
 	void appendSet(
 		std::vector<Set> &to,
 		uint64 setId,
+		bool externalLayout,
 		AppendSkip skip = AppendSkip::None);
 
 	void selectEmoji(EmojiPtr emoji);
@@ -220,9 +234,19 @@ private:
 	void setColumnCount(int count);
 	void refreshFooterIcons();
 
+	void cancelSetsSearch();
+	void showSearchResults();
+	void searchResultsDone(const MTPmessages_FoundStickerSets &result);
+	void refreshSearchRows();
+	void refreshSearchRows(const std::vector<Stickers::Set*> *cloudSets);
+	void fillLocalSearchRows(const QString &query);
+	void fillCloudSearchRows(const std::vector<Stickers::Set*> &sets);
+	void addSearchRow(not_null<const Stickers::Set*> set);
+
 	ChannelData *_megagroupSet = nullptr;
 	std::vector<Set> _mySets;
 	std::vector<Set> _featuredSets;
+	std::vector<Set> _searchSets;
 	base::flat_set<uint64> _installedLocallySets;
 	std::vector<bool> _custom;
 	base::flat_set<not_null<DocumentData*>> _favedStickersMap;
@@ -255,6 +279,12 @@ private:
 	QTimer _previewTimer;
 	bool _previewShown = false;
 
+	std::map<QString, std::vector<Stickers::Set*>> _searchCache;
+	std::vector<std::pair<uint64, QStringList>> _searchIndex;
+	base::Timer _searchRequestTimer;
+	QString _searchQuery, _searchNextQuery;
+	mtpRequestId _searchRequestId = 0;
+
 };
 
 } // namespace ChatHelpers