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

Simplify load_special_sticker_set usage.

This commit is contained in:
levlam 2021-09-24 13:08:32 +03:00
parent f15093deb3
commit a1d1d2160b
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/StickersManager.cpp
View File

@ -1358,7 +1358,9 @@ void StickersManager::load_special_sticker_set_by_type(const SpecialStickerSetTy
} }
void StickersManager::load_special_sticker_set(SpecialStickerSet &sticker_set) { void StickersManager::load_special_sticker_set(SpecialStickerSet &sticker_set) {
CHECK(!sticker_set.is_being_loaded_); if (sticker_set.is_being_loaded_) {
return;
}
sticker_set.is_being_loaded_ = true; sticker_set.is_being_loaded_ = true;
if (sticker_set.id_.is_valid()) { if (sticker_set.id_.is_valid()) {
auto promise = PromiseCreator::lambda([actor_id = actor_id(this), type = sticker_set.type_](Result<Unit> &&result) { auto promise = PromiseCreator::lambda([actor_id = actor_id(this), type = sticker_set.type_](Result<Unit> &&result) {
@ -3992,9 +3994,7 @@ void StickersManager::register_dice(const string &emoji, int32 value, FullMessag
if (need_load) { if (need_load) {
LOG(INFO) << "Waiting for a dice sticker set needed in " << full_message_id; LOG(INFO) << "Waiting for a dice sticker set needed in " << full_message_id;
if (!special_sticker_set.is_being_loaded_) { 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);
@ -4024,9 +4024,7 @@ void StickersManager::get_animated_emoji_click_sticker(const string &message_tex
auto &special_sticker_set = add_special_sticker_set(SpecialStickerSetType::animated_emoji_click()); auto &special_sticker_set = add_special_sticker_set(SpecialStickerSetType::animated_emoji_click());
if (!special_sticker_set.id_.is_valid()) { if (!special_sticker_set.id_.is_valid()) {
// don't wait for the first load of the sticker set from the server // don't wait for the first load of the sticker set from the server
if (!special_sticker_set.is_being_loaded_) { load_special_sticker_set(special_sticker_set);
load_special_sticker_set(special_sticker_set);
}
return promise.set_value(nullptr); return promise.set_value(nullptr);
} }
@ -4038,9 +4036,7 @@ void StickersManager::get_animated_emoji_click_sticker(const string &message_tex
} }
LOG(INFO) << "Waiting for an emoji click sticker set needed in " << full_message_id; LOG(INFO) << "Waiting for an emoji click sticker set needed in " << full_message_id;
if (!special_sticker_set.is_being_loaded_) { load_special_sticker_set(special_sticker_set);
load_special_sticker_set(special_sticker_set);
}
PendingGetAnimatedEmojiClickSticker pending_request; PendingGetAnimatedEmojiClickSticker pending_request;
pending_request.message_text_ = message_text; pending_request.message_text_ = message_text;
@ -4299,9 +4295,7 @@ Status StickersManager::on_animated_emoji_message_clicked(Slice emoji, FullMessa
} }
LOG(INFO) << "Waiting for an emoji click sticker set needed in " << full_message_id; LOG(INFO) << "Waiting for an emoji click sticker set needed in " << full_message_id;
if (!special_sticker_set.is_being_loaded_) { load_special_sticker_set(special_sticker_set);
load_special_sticker_set(special_sticker_set);
}
PendingOnAnimatedEmojiClicked pending_request; PendingOnAnimatedEmojiClicked pending_request;
pending_request.emoji_ = emoji.str(); pending_request.emoji_ = emoji.str();