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

Make searchStickers response cache time-bound.

Browse Source
This commit is contained in:
levlam 2021-01-15 14:53:00 +03:00
parent cb24fd8037
commit dc45d89848
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
td/telegram/StickersManager.cpp
View File

@ -100,9 +100,9 @@ class SearchStickersQuery : public Td::ResultHandler {
string emoji_;
public:
void send(string emoji) {
void send(string emoji, int32 hash) {
emoji_ = std::move(emoji);
send_query(G()->net_query_creator().create(telegram_api::messages_getStickers(emoji_, 0)));
send_query(G()->net_query_creator().create(telegram_api::messages_getStickers(emoji_, hash)));
}
void on_result(uint64 id, BufferSlice packet) override {
@ -3055,9 +3055,9 @@ vector<FileId> StickersManager::search_stickers(string emoji, int32 limit, Promi
}
auto it = found_stickers_.find(emoji);
if (it != found_stickers_.end()) {
if (it != found_stickers_.end() && Time::now() < it->second.next_reload_time_) {
promise.set_value(Unit());
const auto &sticker_ids = it->second.sticker_ids;
const auto &sticker_ids = it->second.sticker_ids_;
auto result_size = min(static_cast<size_t>(limit), sticker_ids.size());
return vector<FileId>(sticker_ids.begin(), sticker_ids.begin() + result_size);
}
@ -3065,7 +3065,11 @@ vector<FileId> StickersManager::search_stickers(string emoji, int32 limit, Promi
auto &promises = search_stickers_queries_[emoji];
promises.push_back(std::move(promise));
if (promises.size() == 1u) {
td_->create_handler<SearchStickersQuery>()->send(std::move(emoji));
int32 hash = 0;
if (it != found_stickers_.end()) {
hash = get_recent_stickers_hash(it->second.sticker_ids_);
}
td_->create_handler<SearchStickersQuery>()->send(std::move(emoji), hash);
}
return {};
@ -3075,17 +3079,27 @@ void StickersManager::on_find_stickers_success(const string &emoji,
tl_object_ptr<telegram_api::messages_Stickers> &&stickers) {
CHECK(stickers != nullptr);
switch (stickers->get_id()) {
case telegram_api::messages_stickersNotModified::ID:
return on_find_stickers_fail(emoji, Status::Error(500, "Receive messages.stickerNotModified"));
case telegram_api::messages_stickersNotModified::ID: {
auto it = found_stickers_.find(emoji);
if (it == found_stickers_.end()) {
return on_find_stickers_fail(emoji, Status::Error(500, "Receive messages.stickerNotModified"));
}
auto &found_stickers = it->second;
found_stickers.next_reload_time_ = Time::now() + found_stickers.cache_time_;
break;
}
case telegram_api::messages_stickers::ID: {
auto found_stickers = move_tl_object_as<telegram_api::messages_stickers>(stickers);
vector<FileId> &sticker_ids = found_stickers_[emoji].sticker_ids;
CHECK(sticker_ids.empty());
auto received_stickers = move_tl_object_as<telegram_api::messages_stickers>(stickers);
for (auto &sticker : found_stickers->stickers_) {
auto &found_stickers = found_stickers_[emoji];
found_stickers.cache_time_ = 300;
found_stickers.next_reload_time_ = Time::now() + found_stickers.cache_time_;
found_stickers.sticker_ids_.clear();
for (auto &sticker : received_stickers->stickers_) {
FileId sticker_id = on_get_sticker_document(std::move(sticker)).second;
if (sticker_id.is_valid()) {
sticker_ids.push_back(sticker_id);
found_stickers.sticker_ids_.push_back(sticker_id);
}
}
break;
@ -3106,7 +3120,10 @@ void StickersManager::on_find_stickers_success(const string &emoji,
}
void StickersManager::on_find_stickers_fail(const string &emoji, Status &&error) {
CHECK(found_stickers_.count(emoji) == 0);
if (found_stickers_.count(emoji) != 0) {
found_stickers_[emoji].cache_time_ = Random::fast(40, 80);
return on_find_stickers_success(emoji, make_tl_object<telegram_api::messages_stickersNotModified>());
}
auto it = search_stickers_queries_.find(emoji);
CHECK(it != search_stickers_queries_.end());

4
td/telegram/StickersManager.h
View File

@ -679,7 +679,9 @@ class StickersManager : public Actor {
Hints installed_sticker_sets_hints_[2]; // search installed sticker sets by their title and name
struct FoundStickers {
vector<FileId> sticker_ids;
vector<FileId> sticker_ids_;
int32 cache_time_ = 300;
double next_reload_time_ = 0;
};
std::unordered_map<string, FoundStickers> found_stickers_;
std::unordered_map<string, vector<Promise<Unit>>> search_stickers_queries_;

2
td/telegram/cli.cpp
View File

@ -716,7 +716,7 @@ class CliClient final : public Actor {
case td_api::stickerSets::ID: {
auto sticker_sets = static_cast<const td_api::stickerSets *>(result.get());
result_str = PSTRING() << "StickerSets { total_count = " << sticker_sets->total_count_
<< ", count = " << sticker_sets->sets_.size() << "}";
<< ", count = " << sticker_sets->sets_.size() << " }";
break;
}
default: