mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Removed matching of installed emoji pack titles from emoji search.
This commit is contained in:
@@ -691,9 +691,6 @@ void EmojiListWidget::applyNextSearchQuery() {
|
||||
if (_mode != Mode::Full || session().premium()) {
|
||||
appendPremiumSearchResults();
|
||||
}
|
||||
if (_mode == Mode::Full) {
|
||||
appendLocalPackSearchResults();
|
||||
}
|
||||
|
||||
_searchQueryText = ranges::accumulate(
|
||||
_searchQuery,
|
||||
@@ -823,62 +820,6 @@ void EmojiListWidget::appendPremiumSearchResults() {
|
||||
}
|
||||
}
|
||||
|
||||
void EmojiListWidget::appendLocalPackSearchResults() {
|
||||
const auto text = _searchQueryText.toLower();
|
||||
if (text.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
const auto test = session().isTestMode();
|
||||
const auto &sets = session().data().stickers().sets();
|
||||
const auto processSet = [&](uint64 setId) {
|
||||
const auto it = sets.find(setId);
|
||||
if (it == sets.end()) {
|
||||
return;
|
||||
}
|
||||
const auto set = it->second.get();
|
||||
if (!(set->flags & Data::StickersSetFlag::Emoji)) {
|
||||
return;
|
||||
}
|
||||
const auto title = set->title.toLower();
|
||||
if (!title.startsWith(text)
|
||||
&& !title.contains(u' ' + text)) {
|
||||
return;
|
||||
}
|
||||
const auto &list = set->stickers.empty()
|
||||
? set->covers
|
||||
: set->stickers;
|
||||
for (const auto document : list) {
|
||||
if (_searchResults.size() >= kCustomSearchLimit) {
|
||||
return;
|
||||
}
|
||||
const auto sticker = document->sticker();
|
||||
if (!sticker) {
|
||||
continue;
|
||||
}
|
||||
const auto id = document->id;
|
||||
if (!_searchCustomIds.emplace(id).second) {
|
||||
continue;
|
||||
}
|
||||
const auto statusId = EmojiStatusId{ id };
|
||||
_searchResults.push_back({
|
||||
.custom = resolveCustomEmoji(
|
||||
statusId,
|
||||
document,
|
||||
SearchEmojiSectionSetId()),
|
||||
.id = { RecentEmojiDocument{ .id = id, .test = test } },
|
||||
});
|
||||
}
|
||||
};
|
||||
for (const auto setId
|
||||
: session().data().stickers().emojiSetsOrder()) {
|
||||
processSet(setId);
|
||||
}
|
||||
for (const auto setId
|
||||
: session().data().stickers().featuredEmojiSetsOrder()) {
|
||||
processSet(setId);
|
||||
}
|
||||
}
|
||||
|
||||
void EmojiListWidget::toggleSearchLoading(bool loading) {
|
||||
if (_search) {
|
||||
_search->setLoading(loading);
|
||||
@@ -1132,9 +1073,6 @@ void EmojiListWidget::showSearchResults() {
|
||||
appendPremiumSearchResults();
|
||||
}
|
||||
fillCloudSearchResults();
|
||||
if (_mode == Mode::Full) {
|
||||
appendLocalPackSearchResults();
|
||||
}
|
||||
fillCloudSearchSets();
|
||||
|
||||
resizeToWidth(width());
|
||||
|
||||
@@ -299,7 +299,6 @@ private:
|
||||
void setupSearch();
|
||||
[[nodiscard]] std::vector<EmojiPtr> collectPlainSearchResults();
|
||||
void appendPremiumSearchResults();
|
||||
void appendLocalPackSearchResults();
|
||||
void sendSearchRequest();
|
||||
void sendSearchSetsRequest(const QString &query);
|
||||
void requestSearchCloud(
|
||||
|
||||
Reference in New Issue
Block a user