RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prefer animated stickers in suggestion by emoji.

This commit is contained in:
John Preston 2019-07-04 16:24:22 +02:00
parent 9d09cee1cc
commit 2d62c9b083
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/chat_helpers/stickers.cpp
View File

@ -731,20 +731,34 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
const auto CreateSortKey = [&]( const auto CreateSortKey = [&](
not_null<DocumentData*> document, not_null<DocumentData*> document,
int base) { int base) {
if (document->sticker() && document->sticker()->animated) {
base += kSlice;
}
return TimeId(base + int((document->id ^ seed) % kSlice)); return TimeId(base + int((document->id ^ seed) % kSlice));
}; };
const auto CreateRecentSortKey = [&](not_null<DocumentData*> document) { const auto CreateRecentSortKey = [&](not_null<DocumentData*> document) {
return CreateSortKey(document, kSlice * 4); return CreateSortKey(document, kSlice * 6);
}; };
auto myCounter = 0; auto myCounter = 0;
const auto CreateMySortKey = [&] { const auto CreateMySortKey = [&](not_null<DocumentData*> document) {
return (kSlice * 4 - (++myCounter)); auto base = kSlice * 6;
if (!document->sticker() || !document->sticker()->animated) {
base -= kSlice;
}
return (base - (++myCounter));
}; };
const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) { const auto CreateFeaturedSortKey = [&](not_null<DocumentData*> document) {
return CreateSortKey(document, kSlice * 2); return CreateSortKey(document, kSlice * 2);
}; };
const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) { const auto CreateOtherSortKey = [&](not_null<DocumentData*> document) {
return CreateSortKey(document, kSlice); return CreateSortKey(document, 0);
};
const auto InstallDateAdjusted = [&](
TimeId date,
not_null<DocumentData*> document) {
return (document->sticker() && document->sticker()->animated)
? date
: date / 2;
}; };
const auto InstallDate = [&](not_null<DocumentData*> document) { const auto InstallDate = [&](not_null<DocumentData*> document) {
Expects(document->sticker() != nullptr); Expects(document->sticker() != nullptr);
@ -754,7 +768,7 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
const auto setId = sticker->set.c_inputStickerSetID().vid.v; const auto setId = sticker->set.c_inputStickerSetID().vid.v;
const auto setIt = sets.find(setId); const auto setIt = sets.find(setId);
if (setIt != sets.end()) { if (setIt != sets.end()) {
return setIt->installDate; return InstallDateAdjusted(setIt->installDate, document);
} }
} }
return TimeId(0); return TimeId(0);
@ -806,9 +820,9 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
for (const auto document : *i) { for (const auto document : *i) {
const auto installDate = my ? it->installDate : TimeId(0); const auto installDate = my ? it->installDate : TimeId(0);
const auto date = (installDate > 1) const auto date = (installDate > 1)
? installDate ? InstallDateAdjusted(installDate, document)
: my : my
? CreateMySortKey() ? CreateMySortKey(document)
: CreateFeaturedSortKey(document); : CreateFeaturedSortKey(document);
add(document, date); add(document, date);
} }
@ -823,7 +837,7 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
// MTPDstickerSet::Flag::f_installed_date); // MTPDstickerSet::Flag::f_installed_date);
if (!setsToRequest.empty()) { if (!setsToRequest.empty()) {
for (const auto [setId, accessHash] : setsToRequest) { for (const auto &[setId, accessHash] : setsToRequest) {
Auth().api().scheduleStickerSetRequest(setId, accessHash); Auth().api().scheduleStickerSetRequest(setId, accessHash);
} }
Auth().api().requestStickerSets(); Auth().api().requestStickerSets();
@ -843,7 +857,7 @@ std::vector<not_null<DocumentData*>> GetListByEmoji(
ranges::action::sort( ranges::action::sort(
result, result,
std::greater<>(), std::greater<>(),
[](const StickerWithDate &data) { return data.date; }); &StickerWithDate::date);
return ranges::view::all( return ranges::view::all(
result result