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

Get from the server only unknown custom emoji.

Browse Source
This commit is contained in:
levlam 2022-07-26 18:48:18 +03:00
parent e96a1995a2
commit 59a27e3b15
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
td/telegram/StickersManager.cpp
View File

@ -1367,11 +1367,11 @@ StickersManager::StickersManager(Td *td, ActorShared<> parent) : td_(td), parent
} }
StickersManager::~StickersManager() { StickersManager::~StickersManager() {
Scheduler::instance()->destroy_on_scheduler(G()->get_gc_scheduler_id(), stickers_, sticker_sets_, Scheduler::instance()->destroy_on_scheduler(
short_name_to_sticker_set_id_, attached_sticker_sets_, found_stickers_, G()->get_gc_scheduler_id(), stickers_, sticker_sets_, short_name_to_sticker_set_id_, attached_sticker_sets_,
found_sticker_sets_, emoji_language_codes_, emoji_language_code_versions_, found_stickers_, found_sticker_sets_, emoji_language_codes_, emoji_language_code_versions_,
emoji_language_code_last_difference_times_, reloaded_emoji_keywords_, emoji_language_code_last_difference_times_, reloaded_emoji_keywords_, premium_gift_messages_, dice_messages_,
premium_gift_messages_, dice_messages_, emoji_messages_); emoji_messages_, custom_emoji_to_sticker_id_);
} }
void StickersManager::start_up() { void StickersManager::start_up() {
@ -5178,10 +5178,28 @@ void StickersManager::on_load_custom_emoji_from_database(int64 custom_emoji_id,
set_promises(promises); set_promises(promises);
} }
td_api::object_ptr<td_api::stickers> StickersManager::get_custom_emoji_stickers_object(
const vector<int64> &document_ids) const {
vector<td_api::object_ptr<td_api::sticker>> stickers;
for (auto document_id : document_ids) {
auto it = custom_emoji_to_sticker_id_.find(document_id);
if (it == custom_emoji_to_sticker_id_.end()) {
continue;
}
auto sticker = get_sticker_object(it->second);
if (sticker != nullptr && sticker->type_->get_id() == td_api::stickerTypeCustomEmoji::ID) {
stickers.push_back(std::move(sticker));
}
}
return td_api::make_object<td_api::stickers>(std::move(stickers));
}
void StickersManager::get_custom_emoji_stickers(vector<int64> &&document_ids, bool use_database, void StickersManager::get_custom_emoji_stickers(vector<int64> &&document_ids, bool use_database,
Promise<td_api::object_ptr<td_api::stickers>> &&promise) { Promise<td_api::object_ptr<td_api::stickers>> &&promise) {
TRY_STATUS_PROMISE(promise, G()->close_status()); TRY_STATUS_PROMISE(promise, G()->close_status());
td::unique(document_ids);
vector<int64> unknown_document_ids; vector<int64> unknown_document_ids;
for (auto document_id : document_ids) { for (auto document_id : document_ids) {
if (custom_emoji_to_sticker_id_.count(document_id) == 0) { if (custom_emoji_to_sticker_id_.count(document_id) == 0) {
@ -5190,13 +5208,7 @@ void StickersManager::get_custom_emoji_stickers(vector<int64> &&document_ids, bo
} }
if (unknown_document_ids.empty()) { if (unknown_document_ids.empty()) {
vector<td_api::object_ptr<td_api::sticker>> stickers; return promise.set_value(get_custom_emoji_stickers_object(document_ids));
for (auto document_id : document_ids) {
auto sticker = get_sticker_object(custom_emoji_to_sticker_id_[document_id]);
CHECK(sticker != nullptr);
stickers.push_back(std::move(sticker));
}
return promise.set_value(td_api::make_object<td_api::stickers>(std::move(stickers)));
} }
if (use_database && G()->parameters().use_file_db) { if (use_database && G()->parameters().use_file_db) {
@ -5215,17 +5227,17 @@ void StickersManager::get_custom_emoji_stickers(vector<int64> &&document_ids, bo
return lock.set_value(Unit()); return lock.set_value(Unit());
} }
auto query_promise = auto query_promise = PromiseCreator::lambda(
PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)]( [actor_id = actor_id(this), document_ids = std::move(document_ids), promise = std::move(promise)](
Result<vector<telegram_api::object_ptr<telegram_api::Document>>> r_documents) mutable { Result<vector<telegram_api::object_ptr<telegram_api::Document>>> r_documents) mutable {
send_closure(actor_id, &StickersManager::on_get_custom_emoji_documents, std::move(r_documents), send_closure(actor_id, &StickersManager::on_get_custom_emoji_documents, std::move(r_documents),
std::move(promise)); std::move(document_ids), std::move(promise));
}); });
td_->create_handler<GetCustomEmojiDocumentsQuery>(std::move(query_promise))->send(std::move(document_ids)); td_->create_handler<GetCustomEmojiDocumentsQuery>(std::move(query_promise))->send(std::move(unknown_document_ids));
} }
void StickersManager::on_get_custom_emoji_documents( void StickersManager::on_get_custom_emoji_documents(
Result<vector<telegram_api::object_ptr<telegram_api::Document>>> r_documents, Result<vector<telegram_api::object_ptr<telegram_api::Document>>> &&r_documents, vector<int64> &&document_ids,
Promise<td_api::object_ptr<td_api::stickers>> &&promise) { Promise<td_api::object_ptr<td_api::stickers>> &&promise) {
TRY_STATUS_PROMISE(promise, G()->close_status()); TRY_STATUS_PROMISE(promise, G()->close_status());
if (r_documents.is_error()) { if (r_documents.is_error()) {
@ -5233,19 +5245,11 @@ void StickersManager::on_get_custom_emoji_documents(
} }
auto documents = r_documents.move_as_ok(); auto documents = r_documents.move_as_ok();
vector<td_api::object_ptr<td_api::sticker>> stickers;
for (auto &document : documents) { for (auto &document : documents) {
std::pair<int64, FileId> sticker_info = on_get_sticker_document(std::move(document), StickerFormat::Unknown); on_get_sticker_document(std::move(document), StickerFormat::Unknown);
auto sticker = get_sticker_object(sticker_info.second);
if (sticker == nullptr || sticker->type_->get_id() != td_api::stickerTypeCustomEmoji::ID) {
LOG(ERROR) << "Receive an invalid custom emoji sticker " << to_string(sticker);
continue;
}
stickers.push_back(std::move(sticker));
} }
promise.set_value(td_api::make_object<td_api::stickers>(std::move(stickers))); promise.set_value(get_custom_emoji_stickers_object(document_ids));
} }
void StickersManager::get_premium_gift_option_sticker(int32 month_count, bool is_recursive, void StickersManager::get_premium_gift_option_sticker(int32 month_count, bool is_recursive,

5
td/telegram/StickersManager.h
View File

@ -796,7 +796,10 @@ class StickersManager final : public Actor {
static void add_sticker_thumbnail(Sticker *s, PhotoSize thumbnail); static void add_sticker_thumbnail(Sticker *s, PhotoSize thumbnail);
void on_get_custom_emoji_documents(Result<vector<telegram_api::object_ptr<telegram_api::Document>>> r_documents, td_api::object_ptr<td_api::stickers> get_custom_emoji_stickers_object(const vector<int64> &document_ids) const;
void on_get_custom_emoji_documents(Result<vector<telegram_api::object_ptr<telegram_api::Document>>> &&r_documents,
vector<int64> &&document_ids,
Promise<td_api::object_ptr<td_api::stickers>> &&promise); Promise<td_api::object_ptr<td_api::stickers>> &&promise);
static string get_emoji_language_code_version_database_key(const string &language_code); static string get_emoji_language_code_version_database_key(const string &language_code);