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

Do not try to attach stickers not from sticker sets.

Browse Source 
GitOrigin-RevId: e5ae71d7e47ab5e055ecdafd22a0cbe77c19ab71
This commit is contained in:
levlam 2019-01-06 21:26:19 +03:00
parent 0403c58c73
commit c8f3573ca5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/StickersManager.cpp
View File

@ -3445,22 +3445,28 @@ vector<FileId> StickersManager::get_attached_sticker_file_ids(const vector<int32
result.reserve(int_file_ids.size()); result.reserve(int_file_ids.size());
for (auto int_file_id : int_file_ids) { for (auto int_file_id : int_file_ids) {
FileId file_id(int_file_id, 0); FileId file_id(int_file_id, 0);
if (get_sticker(file_id) == nullptr) { const Sticker *s = get_sticker(file_id);
if (s == nullptr) {
LOG(WARNING) << "Can't find sticker " << file_id; LOG(WARNING) << "Can't find sticker " << file_id;
continue; continue;
} }
if (s->set_id == 0) {
// only stickers from sticker sets can be attached to files
continue;
}
auto file_view = td_->file_manager_->get_file_view(file_id); auto file_view = td_->file_manager_->get_file_view(file_id);
CHECK(!file_view.empty()); CHECK(!file_view.empty());
if (!file_view.has_remote_location()) { if (!file_view.has_remote_location()) {
LOG(WARNING) << "Sticker " << file_id << " has no remote location"; LOG(ERROR) << "Sticker " << file_id << " has no remote location";
continue; continue;
} }
if (file_view.remote_location().is_web()) { if (file_view.remote_location().is_web()) {
LOG(WARNING) << "Sticker " << file_id << " is web"; LOG(ERROR) << "Sticker " << file_id << " is web";
continue; continue;
} }
if (!file_view.remote_location().is_document()) { if (!file_view.remote_location().is_document()) {
LOG(WARNING) << "Sticker " << file_id << " is encrypted"; LOG(ERROR) << "Sticker " << file_id << " is encrypted";
continue; continue;
} }
result.push_back(file_id); result.push_back(file_id);