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

Add source to ContactsManager::do_update_user_photo.

Browse Source 
GitOrigin-RevId: 086ca18898448cbcd44977965a0f8f0ddc799ead
This commit is contained in:
levlam 2019-06-17 03:39:00 +03:00
parent c06f173444
commit 4a8411329f
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/ContactsManager.cpp
View File

@ -2966,7 +2966,7 @@ const DialogPhoto *ContactsManager::get_user_dialog_photo(UserId user_id) {
auto it = pending_user_photos_.find(user_id); auto it = pending_user_photos_.find(user_id);
if (it != pending_user_photos_.end()) { if (it != pending_user_photos_.end()) {
do_update_user_photo(u, user_id, std::move(it->second)); do_update_user_photo(u, user_id, std::move(it->second), "get_user_dialog_photo");
pending_user_photos_.erase(it); pending_user_photos_.erase(it);
update_user(u, user_id); update_user(u, user_id);
} }
@ -5119,7 +5119,7 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
if (is_received) { if (is_received) {
on_update_user_phone_number(u, user_id, std::move(user->phone_)); on_update_user_phone_number(u, user_id, std::move(user->phone_));
} }
on_update_user_photo(u, user_id, std::move(user->photo_)); on_update_user_photo(u, user_id, std::move(user->photo_), "on_get_user");
if (is_received) { if (is_received) {
on_update_user_online(u, user_id, std::move(user->status_)); on_update_user_online(u, user_id, std::move(user->status_));
@ -6941,7 +6941,7 @@ void ContactsManager::on_update_user_photo(UserId user_id, tl_object_ptr<telegra
User *u = get_user_force(user_id); User *u = get_user_force(user_id);
if (u != nullptr) { if (u != nullptr) {
on_update_user_photo(u, user_id, std::move(photo_ptr)); on_update_user_photo(u, user_id, std::move(photo_ptr), "on_update_user_photo");
update_user(u, user_id); update_user(u, user_id);
} else { } else {
LOG(INFO) << "Ignore update user photo about unknown " << user_id; LOG(INFO) << "Ignore update user photo about unknown " << user_id;
@ -6949,7 +6949,7 @@ void ContactsManager::on_update_user_photo(UserId user_id, tl_object_ptr<telegra
} }
void ContactsManager::on_update_user_photo(User *u, UserId user_id, void ContactsManager::on_update_user_photo(User *u, UserId user_id,
tl_object_ptr<telegram_api::UserProfilePhoto> &&photo) { tl_object_ptr<telegram_api::UserProfilePhoto> &&photo, const char *source) {
if (td_->auth_manager_->is_bot() && !G()->parameters().use_file_db && !u->is_photo_inited) { if (td_->auth_manager_->is_bot() && !G()->parameters().use_file_db && !u->is_photo_inited) {
bool is_empty = photo == nullptr || photo->get_id() == telegram_api::userProfilePhotoEmpty::ID; bool is_empty = photo == nullptr || photo->get_id() == telegram_api::userProfilePhotoEmpty::ID;
pending_user_photos_[user_id] = std::move(photo); pending_user_photos_[user_id] = std::move(photo);
@ -6967,13 +6967,14 @@ void ContactsManager::on_update_user_photo(User *u, UserId user_id,
return; return;
} }
do_update_user_photo(u, user_id, std::move(photo)); do_update_user_photo(u, user_id, std::move(photo), source);
} }
void ContactsManager::do_update_user_photo(User *u, UserId user_id, void ContactsManager::do_update_user_photo(User *u, UserId user_id,
tl_object_ptr<telegram_api::UserProfilePhoto> &&photo) { tl_object_ptr<telegram_api::UserProfilePhoto> &&photo, const char *source) {
u->is_photo_inited = true; u->is_photo_inited = true;
LOG_IF(ERROR, u->access_hash == -1) << "Update profile photo of " << user_id << " without access hash"; LOG_IF(ERROR, u->access_hash == -1) << "Update profile photo of " << user_id << " without access hash from "
<< source;
ProfilePhoto new_photo = get_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, std::move(photo)); ProfilePhoto new_photo = get_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, std::move(photo));
if (new_photo != u->photo) { if (new_photo != u->photo) {

6
td/telegram/ContactsManager.h
View File

@ -880,12 +880,14 @@ class ContactsManager : public Actor {
void on_update_user_name(User *u, UserId user_id, string &&first_name, string &&last_name, string &&username); void on_update_user_name(User *u, UserId user_id, string &&first_name, string &&last_name, string &&username);
void on_update_user_phone_number(User *u, UserId user_id, string &&phone_number); void on_update_user_phone_number(User *u, UserId user_id, string &&phone_number);
void on_update_user_photo(User *u, UserId user_id, tl_object_ptr<telegram_api::UserProfilePhoto> &&photo); void on_update_user_photo(User *u, UserId user_id, tl_object_ptr<telegram_api::UserProfilePhoto> &&photo,
const char *source);
void on_update_user_online(User *u, UserId user_id, tl_object_ptr<telegram_api::UserStatus> &&status); void on_update_user_online(User *u, UserId user_id, tl_object_ptr<telegram_api::UserStatus> &&status);
void on_update_user_local_was_online(User *u, UserId user_id, int32 local_was_online); void on_update_user_local_was_online(User *u, UserId user_id, int32 local_was_online);
void on_update_user_links(User *u, UserId user_id, LinkState outbound, LinkState inbound); void on_update_user_links(User *u, UserId user_id, LinkState outbound, LinkState inbound);
void do_update_user_photo(User *u, UserId user_id, tl_object_ptr<telegram_api::UserProfilePhoto> &&photo); void do_update_user_photo(User *u, UserId user_id, tl_object_ptr<telegram_api::UserProfilePhoto> &&photo,
const char *source);
void add_user_photo_id(User *u, UserId user_id, int64 photo_id, const vector<FileId> &photo_file_ids); void add_user_photo_id(User *u, UserId user_id, int64 photo_id, const vector<FileId> &photo_file_ids);