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

Combine sticker set reload queries.

Browse Source
This commit is contained in:
levlam 2022-12-21 17:07:21 +03:00
parent 0d4c918fea
commit 816c7d312a
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
td/telegram/StickersManager.cpp
View File

@ -5439,12 +5439,70 @@ void StickersManager::reload_sticker_set(StickerSetId sticker_set_id, int64 acce
void StickersManager::do_reload_sticker_set(StickerSetId sticker_set_id, void StickersManager::do_reload_sticker_set(StickerSetId sticker_set_id,
tl_object_ptr<telegram_api::InputStickerSet> &&input_sticker_set, tl_object_ptr<telegram_api::InputStickerSet> &&input_sticker_set,
int32 hash, Promise<Unit> &&promise, const char *source) const { int32 hash, Promise<Unit> &&promise, const char *source) {
TRY_STATUS_PROMISE(promise, G()->close_status()); TRY_STATUS_PROMISE(promise, G()->close_status());
CHECK(input_sticker_set != nullptr);
LOG(INFO) << "Reload " << sticker_set_id << " from " << source; LOG(INFO) << "Reload " << sticker_set_id << " from " << source;
if (sticker_set_id.is_valid() && input_sticker_set->get_id() == telegram_api::inputStickerSetID::ID) {
auto &queries = sticker_set_reload_queries_[sticker_set_id];
if (queries == nullptr) {
queries = make_unique<StickerSetReloadQueries>();
}
if (!queries->sent_promises_.empty()) {
// query has already been sent, just wait for the result
if (queries->sent_hash_ == 0 || hash == queries->sent_hash_) {
LOG(INFO) << "Wait for result of the sent reload query";
queries->sent_promises_.push_back(std::move(promise));
} else {
LOG(INFO) << "Postpone reload of " << sticker_set_id << ", because another query was sent";
if (queries->pending_promises_.empty()) {
queries->pending_hash_ = hash;
} else if (queries->pending_hash_ != hash) {
queries->pending_hash_ = 0;
}
queries->pending_promises_.push_back(std::move(promise));
}
return;
}
CHECK(queries->pending_promises_.empty());
queries->sent_promises_.push_back(std::move(promise));
queries->sent_hash_ = hash;
promise = PromiseCreator::lambda([actor_id = actor_id(this), sticker_set_id](Result<Unit> result) mutable {
send_closure(actor_id, &StickersManager::on_reload_sticker_set, sticker_set_id, std::move(result));
});
}
td_->create_handler<GetStickerSetQuery>(std::move(promise))->send(sticker_set_id, std::move(input_sticker_set), hash); td_->create_handler<GetStickerSetQuery>(std::move(promise))->send(sticker_set_id, std::move(input_sticker_set), hash);
} }
void StickersManager::on_reload_sticker_set(StickerSetId sticker_set_id, Result<Unit> &&result) {
if (G()->close_flag()) {
result = Global::request_aborted_error();
}
LOG(INFO) << "Reloaded " << sticker_set_id;
auto it = sticker_set_reload_queries_.find(sticker_set_id);
CHECK(it != sticker_set_reload_queries_.end());
auto queries = std::move(it->second);
sticker_set_reload_queries_.erase(it);
CHECK(queries != nullptr);
CHECK(!queries->sent_promises_.empty());
if (result.is_error()) {
fail_promises(queries->sent_promises_, result.error().clone());
fail_promises(queries->pending_promises_, result.move_as_error());
return;
}
set_promises(queries->sent_promises_);
if (!queries->pending_promises_.empty()) {
auto sticker_set = get_sticker_set(sticker_set_id);
auto access_hash = sticker_set == nullptr ? 0 : sticker_set->access_hash_;
for (auto &promise : queries->pending_promises_) {
do_reload_sticker_set(sticker_set_id,
make_tl_object<telegram_api::inputStickerSetID>(sticker_set_id.get(), access_hash),
queries->pending_hash_, std::move(promise), "on_reload_sticker_set");
}
}
}
void StickersManager::on_install_sticker_set(StickerSetId set_id, bool is_archived, void StickersManager::on_install_sticker_set(StickerSetId set_id, bool is_archived,
tl_object_ptr<telegram_api::messages_StickerSetInstallResult> &&result) { tl_object_ptr<telegram_api::messages_StickerSetInstallResult> &&result) {
StickerSet *sticker_set = get_sticker_set(set_id); StickerSet *sticker_set = get_sticker_set(set_id);

12
td/telegram/StickersManager.h
View File

@ -684,7 +684,9 @@ class StickersManager final : public Actor {
void do_reload_sticker_set(StickerSetId sticker_set_id, void do_reload_sticker_set(StickerSetId sticker_set_id,
tl_object_ptr<telegram_api::InputStickerSet> &&input_sticker_set, int32 hash, tl_object_ptr<telegram_api::InputStickerSet> &&input_sticker_set, int32 hash,
Promise<Unit> &&promise, const char *source) const; Promise<Unit> &&promise, const char *source);
void on_reload_sticker_set(StickerSetId sticker_set_id, Result<Unit> &&result);
void do_get_premium_stickers(int32 limit, Promise<td_api::object_ptr<td_api::stickers>> &&promise); void do_get_premium_stickers(int32 limit, Promise<td_api::object_ptr<td_api::stickers>> &&promise);
@ -1004,6 +1006,14 @@ class StickersManager final : public Actor {
vector<Promise<Unit>> load_favorite_stickers_queries_; vector<Promise<Unit>> load_favorite_stickers_queries_;
vector<Promise<Unit>> repair_favorite_stickers_queries_; vector<Promise<Unit>> repair_favorite_stickers_queries_;
struct StickerSetReloadQueries {
vector<Promise<Unit>> sent_promises_;
int32 sent_hash_ = 0;
vector<Promise<Unit>> pending_promises_;
int32 pending_hash_ = 0;
};
FlatHashMap<StickerSetId, unique_ptr<StickerSetReloadQueries>, StickerSetIdHash> sticker_set_reload_queries_;
vector<FileId> recent_sticker_file_ids_[2]; vector<FileId> recent_sticker_file_ids_[2];
FileSourceId recent_stickers_file_source_id_[2]; FileSourceId recent_stickers_file_source_id_[2];
vector<FileId> favorite_sticker_file_ids_; vector<FileId> favorite_sticker_file_ids_;