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

Use request promise in td_api::searchStickers.

Browse Source
This commit is contained in:
levlam 2022-08-01 18:50:08 +03:00
parent d4135d59f6
commit 0f77d5c871
3 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
td/telegram/StickersManager.cpp
View File

@ -4072,35 +4072,31 @@ vector<FileId> StickersManager::get_stickers(StickerType sticker_type, string em
return result;
}
vector<FileId> StickersManager::search_stickers(string emoji, int32 limit, Promise<Unit> &&promise) {
void StickersManager::search_stickers(string emoji, int32 limit, Promise<td_api::object_ptr<td_api::stickers>> &&promise) {
if (limit <= 0) {
promise.set_error(Status::Error(400, "Parameter limit must be positive"));
return {};
return promise.set_error(Status::Error(400, "Parameter limit must be positive"));
}
if (limit > MAX_FOUND_STICKERS) {
limit = MAX_FOUND_STICKERS;
}
if (emoji.empty()) {
promise.set_error(Status::Error(400, "Emoji must be non-empty"));
return {};
return promise.set_error(Status::Error(400, "Emoji must be non-empty"));
}
remove_emoji_modifiers_in_place(emoji);
if (emoji.empty()) {
promise.set_value(Unit());
return {};
return promise.set_value(get_stickers_object({}));
}
auto it = found_stickers_.find(emoji);
if (it != found_stickers_.end() && Time::now() < it->second.next_reload_time_) {
promise.set_value(Unit());
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);
return promise.set_value(get_stickers_object({sticker_ids.begin(), sticker_ids.begin() + result_size}));
}
auto &promises = search_stickers_queries_[emoji];
promises.push_back(std::move(promise));
promises.emplace_back(limit, std::move(promise));
if (promises.size() == 1u) {
int64 hash = 0;
if (it != found_stickers_.end()) {
@ -4108,8 +4104,6 @@ vector<FileId> StickersManager::search_stickers(string emoji, int32 limit, Promi
}
td_->create_handler<SearchStickersQuery>()->send(std::move(emoji), hash);
}
return {};
}
void StickersManager::on_find_stickers_success(const string &emoji,
@ -4148,10 +4142,16 @@ void StickersManager::on_find_stickers_success(const string &emoji,
auto it = search_stickers_queries_.find(emoji);
CHECK(it != search_stickers_queries_.end());
CHECK(!it->second.empty());
auto promises = std::move(it->second);
auto queries = std::move(it->second);
search_stickers_queries_.erase(it);
set_promises(promises);
auto result_it = found_stickers_.find(emoji);
CHECK(result_it != found_stickers_.end());
const auto &sticker_ids = result_it->second.sticker_ids_;
for (auto &query : queries) {
auto result_size = min(static_cast<size_t>(query.first), sticker_ids.size());
query.second.set_value(get_stickers_object({sticker_ids.begin(), sticker_ids.begin() + result_size}));
}
}
void StickersManager::on_find_stickers_fail(const string &emoji, Status &&error) {
@ -4163,10 +4163,12 @@ void StickersManager::on_find_stickers_fail(const string &emoji, Status &&error)
auto it = search_stickers_queries_.find(emoji);
CHECK(it != search_stickers_queries_.end());
CHECK(!it->second.empty());
auto promises = std::move(it->second);
auto queries = std::move(it->second);
search_stickers_queries_.erase(it);
fail_promises(promises, std::move(error));
for (auto &query : queries) {
query.second.set_error(error.clone());
}
}
vector<StickerSetId> StickersManager::get_installed_sticker_sets(StickerType sticker_type, Promise<Unit> &&promise) {

4
td/telegram/StickersManager.h
View File

@ -136,7 +136,7 @@ class StickersManager final : public Actor {
vector<FileId> get_stickers(StickerType sticker_type, string emoji, int32 limit, bool force, Promise<Unit> &&promise);
vector<FileId> search_stickers(string emoji, int32 limit, Promise<Unit> &&promise);
void search_stickers(string emoji, int32 limit, Promise<td_api::object_ptr<td_api::stickers>> &&promise);
vector<StickerSetId> get_installed_sticker_sets(StickerType sticker_type, Promise<Unit> &&promise);
@ -906,7 +906,7 @@ class StickersManager final : public Actor {
double next_reload_time_ = 0;
};
FlatHashMap<string, FoundStickers> found_stickers_;
FlatHashMap<string, vector<Promise<Unit>>> search_stickers_queries_;
FlatHashMap<string, vector<std::pair<int32, Promise<td_api::object_ptr<td_api::stickers>>>>> search_stickers_queries_;
std::unordered_map<string, vector<StickerSetId>> found_sticker_sets_;
std::unordered_map<string, vector<Promise<Unit>>> search_sticker_sets_queries_;

26
td/telegram/Td.cpp
View File

@ -2005,26 +2005,6 @@ class GetStickersRequest final : public RequestActor<> {
}
};
class SearchStickersRequest final : public RequestActor<> {
string emoji_;
int32 limit_;
vector<FileId> sticker_ids_;
void do_run(Promise<Unit> &&promise) final {
sticker_ids_ = td_->stickers_manager_->search_stickers(emoji_, limit_, std::move(promise));
}
void do_send_result() final {
send_result(td_->stickers_manager_->get_stickers_object(sticker_ids_));
}
public:
SearchStickersRequest(ActorShared<Td> td, uint64 request_id, string &&emoji, int32 limit)
: RequestActor(std::move(td), request_id), emoji_(std::move(emoji)), limit_(limit) {
}
};
class GetInstalledStickerSetsRequest final : public RequestActor<> {
StickerType sticker_type_;
@ -6996,7 +6976,8 @@ void Td::on_request(uint64 id, td_api::getStickers &request) {
void Td::on_request(uint64 id, td_api::searchStickers &request) {
CHECK_IS_USER();
CLEAN_INPUT_STRING(request.emoji_);
CREATE_REQUEST(SearchStickersRequest, std::move(request.emoji_), request.limit_);
CREATE_REQUEST_PROMISE();
stickers_manager_->search_stickers(std::move(request.emoji_), request.limit_, std::move(promise));
}
void Td::on_request(uint64 id, const td_api::getInstalledStickerSets &request) {
@ -7906,7 +7887,8 @@ void Td::on_request(uint64 id, const td_api::getPremiumFeatures &request) {
void Td::on_request(uint64 id, const td_api::getPremiumStickerExamples &request) {
CHECK_IS_USER();
CREATE_REQUEST(SearchStickersRequest, "⭐️⭐️", 100);
CREATE_REQUEST_PROMISE();
stickers_manager_->search_stickers("⭐️⭐️", 100, std::move(promise));
}
void Td::on_request(uint64 id, const td_api::viewPremiumFeature &request) {