tdlight-team/tdlight
tdlight-team
/
tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer animated stickers in getStickers. 

GitOrigin-RevId: 1652ae43c36ebcb69752042cebb5dc8407558c06
This commit is contained in:
levlam 2019-07-26 02:54:35 +03:00
parent 912ab17351
commit 3fac3f7860
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
td/telegram/StickersManager.cpp
View File

@ -2176,6 +2176,16 @@ vector<FileId> StickersManager::get_stickers(string emoji, int32 limit, bool for
}
}
auto prefer_animated = [this](FileId lhs, FileId rhs) {
const Sticker *lhs_s = get_sticker(lhs);
const Sticker *rhs_s = get_sticker(rhs);
return lhs_s->is_animated && !rhs_s->is_animated;
};
std::stable_sort(prepend_sticker_ids.begin(), prepend_sticker_ids.begin() + recent_sticker_ids_[0].size(),
prefer_animated);
std::stable_sort(prepend_sticker_ids.begin() + recent_sticker_ids_[0].size(), prepend_sticker_ids.end(),
prefer_animated);
LOG(INFO) << "Have " << recent_sticker_ids_[0] << " recent and " << favorite_sticker_ids_ << " favorite stickers";
for (const auto &sticker_id : prepend_sticker_ids) {
const Sticker *s = get_sticker(sticker_id);
@ -2223,22 +2233,25 @@ vector<FileId> StickersManager::get_stickers(string emoji, int32 limit, bool for
}
}
} else {
vector<int64> examined_sticker_set_ids; // = featured_sticker_set_ids_;
vector<const StickerSet *> examined_sticker_sets;
for (const auto &sticker_set_id : installed_sticker_set_ids_[0]) {
if (std::find(examined_sticker_set_ids.begin(), examined_sticker_set_ids.end(), sticker_set_id) ==
examined_sticker_set_ids.end()) {
examined_sticker_set_ids.push_back(sticker_set_id);
}
}
for (const auto &sticker_set_id : examined_sticker_set_ids) {
const StickerSet *sticker_set = get_sticker_set(sticker_set_id);
if (sticker_set == nullptr || !sticker_set->was_loaded) {
continue;
}
if (std::find(examined_sticker_sets.begin(), examined_sticker_sets.end(), sticker_set) ==
examined_sticker_sets.end()) {
examined_sticker_sets.push_back(sticker_set);
}
}
std::stable_sort(
examined_sticker_sets.begin(), examined_sticker_sets.end(),
[](const StickerSet *lhs, const StickerSet *rhs) { return lhs->is_animated && !rhs->is_animated; });
for (auto sticker_set : examined_sticker_sets) {
auto it = sticker_set->emoji_stickers_map_.find(emoji);
if (it != sticker_set->emoji_stickers_map_.end()) {
LOG(INFO) << "Add " << it->second << " stickers from set " << sticker_set_id;
LOG(INFO) << "Add " << it->second << " stickers from set " << sticker_set->id;
append(result, it->second);
}
}

2
td/telegram/cli.cpp
View File

@ -408,7 +408,7 @@ class CliClient final : public Actor {
parameters->system_language_code_ = "en";
parameters->device_model_ = "Desktop";
parameters->system_version_ = "Unknown";
parameters->application_version_ = "tg_cli";
parameters->application_version_ = "1.0";
send_request(td_api::make_object<td_api::setTdlibParameters>(std::move(parameters)));
break;
}