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

Reload special sticker sets only once simultaneously.

Browse Source
This commit is contained in:
levlam 2021-12-01 20:30:02 +03:00
parent d5a7dc2638
commit 3b1ec88067
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
td/telegram/StickersManager.cpp
View File

@ -1362,7 +1362,7 @@ void StickersManager::load_special_sticker_set_info_from_binlog(SpecialStickerSe
short_name_to_sticker_set_id_.emplace(sticker_set.short_name_, sticker_set.id_); short_name_to_sticker_set_id_.emplace(sticker_set.short_name_, sticker_set.id_);
} }
void StickersManager::load_special_sticker_set_by_type(const SpecialStickerSetType &type) { void StickersManager::load_special_sticker_set_by_type(SpecialStickerSetType type) {
if (G()->close_flag()) { if (G()->close_flag()) {
return; return;
} }
@ -1387,18 +1387,35 @@ void StickersManager::load_special_sticker_set(SpecialStickerSet &sticker_set) {
}); });
load_sticker_sets({sticker_set.id_}, std::move(promise)); load_sticker_sets({sticker_set.id_}, std::move(promise));
} else { } else {
reload_special_sticker_set(sticker_set); reload_special_sticker_set(sticker_set, 0);
} }
} }
void StickersManager::reload_special_sticker_set(SpecialStickerSet &sticker_set) { void StickersManager::reload_special_sticker_set_by_type(SpecialStickerSetType type) {
int32 hash = 0; auto &sticker_set = add_special_sticker_set(type);
if (sticker_set.id_.is_valid()) { if (sticker_set.is_being_reloaded_) {
return;
}
if (!sticker_set.id_.is_valid()) {
return reload_special_sticker_set(sticker_set, 0);
}
const auto *s = get_sticker_set(sticker_set.id_); const auto *s = get_sticker_set(sticker_set.id_);
if (s != nullptr && s->is_inited && s->is_loaded) { if (s != nullptr && s->is_inited) {
hash = s->hash; if (s->was_loaded) {
return reload_special_sticker_set(sticker_set, s->is_loaded ? s->hash : 0);
} }
} }
reload_special_sticker_set(sticker_set, 0);
}
void StickersManager::reload_special_sticker_set(SpecialStickerSet &sticker_set, int32 hash) {
if (sticker_set.is_being_reloaded_) {
return;
}
sticker_set.is_being_reloaded_ = true;
td_->create_handler<ReloadSpecialStickerSetQuery>()->send(sticker_set.id_, sticker_set.type_, hash); td_->create_handler<ReloadSpecialStickerSetQuery>()->send(sticker_set.id_, sticker_set.type_, hash);
} }
@ -1408,6 +1425,7 @@ void StickersManager::on_load_special_sticker_set(const SpecialStickerSetType &t
} }
auto &special_sticker_set = add_special_sticker_set(type); auto &special_sticker_set = add_special_sticker_set(type);
special_sticker_set.is_being_reloaded_ = false;
if (!special_sticker_set.is_being_loaded_) { if (!special_sticker_set.is_being_loaded_) {
return; return;
} }
@ -1415,8 +1433,9 @@ void StickersManager::on_load_special_sticker_set(const SpecialStickerSetType &t
if (result.is_error()) { if (result.is_error()) {
// failed to load the special sticker set; repeat after some time // failed to load the special sticker set; repeat after some time
create_actor<SleepActor>("RetryLoadSpecialStickerSetActor", Random::fast(300, 600), create_actor<SleepActor>("RetryLoadSpecialStickerSetActor", Random::fast(300, 600),
PromiseCreator::lambda([actor_id = actor_id(this), type](Result<Unit> result) { PromiseCreator::lambda([actor_id = actor_id(this), type](Result<Unit> result) mutable {
send_closure(actor_id, &StickersManager::load_special_sticker_set_by_type, type); send_closure(actor_id, &StickersManager::load_special_sticker_set_by_type,
std::move(type));
})) }))
.release(); .release();
return; return;
@ -4218,10 +4237,11 @@ void StickersManager::register_dice(const string &emoji, int32 value, FullMessag
auto &special_sticker_set = add_special_sticker_set(SpecialStickerSetType::animated_dice(emoji)); auto &special_sticker_set = add_special_sticker_set(SpecialStickerSetType::animated_dice(emoji));
bool need_load = false; bool need_load = false;
StickerSet *sticker_set = nullptr;
if (!special_sticker_set.id_.is_valid()) { if (!special_sticker_set.id_.is_valid()) {
need_load = true; need_load = true;
} else { } else {
auto sticker_set = get_sticker_set(special_sticker_set.id_); sticker_set = get_sticker_set(special_sticker_set.id_);
CHECK(sticker_set != nullptr); CHECK(sticker_set != nullptr);
need_load = !sticker_set->was_loaded; need_load = !sticker_set->was_loaded;
} }
@ -4231,7 +4251,7 @@ void StickersManager::register_dice(const string &emoji, int32 value, FullMessag
load_special_sticker_set(special_sticker_set); load_special_sticker_set(special_sticker_set);
} else { } else {
// TODO reload once in a while // TODO reload once in a while
// reload_special_sticker_set(special_sticker_set); // reload_special_sticker_set(special_sticker_set, sticker_set->is_loaded ? sticker_set->hash : 0);
} }
} }
@ -7396,8 +7416,8 @@ void StickersManager::after_get_difference() {
get_recent_stickers(true, Auto()); get_recent_stickers(true, Auto());
get_favorite_stickers(Auto()); get_favorite_stickers(Auto());
reload_special_sticker_set(add_special_sticker_set(SpecialStickerSetType::animated_emoji())); reload_special_sticker_set_by_type(SpecialStickerSetType::animated_emoji());
reload_special_sticker_set(add_special_sticker_set(SpecialStickerSetType::animated_emoji_click())); reload_special_sticker_set_by_type(SpecialStickerSetType::animated_emoji_click());
} }
} }

7
td/telegram/StickersManager.h
View File

@ -436,6 +436,7 @@ class StickersManager final : public Actor {
string short_name_; string short_name_;
SpecialStickerSetType type_; SpecialStickerSetType type_;
bool is_being_loaded_ = false; bool is_being_loaded_ = false;
bool is_being_reloaded_ = false;
}; };
class StickerListLogEvent; class StickerListLogEvent;
@ -661,11 +662,13 @@ class StickersManager final : public Actor {
void load_special_sticker_set_info_from_binlog(SpecialStickerSet &sticker_set); void load_special_sticker_set_info_from_binlog(SpecialStickerSet &sticker_set);
void load_special_sticker_set_by_type(const SpecialStickerSetType &type); void load_special_sticker_set_by_type(SpecialStickerSetType type);
void load_special_sticker_set(SpecialStickerSet &sticker_set); void load_special_sticker_set(SpecialStickerSet &sticker_set);
void reload_special_sticker_set(SpecialStickerSet &sticker_set); void reload_special_sticker_set_by_type(SpecialStickerSetType type);
void reload_special_sticker_set(SpecialStickerSet &sticker_set, int32 hash);
static void add_sticker_thumbnail(Sticker *s, PhotoSize thumbnail); static void add_sticker_thumbnail(Sticker *s, PhotoSize thumbnail);