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

Ensure that full photo and is null if unknown.

Browse Source
This commit is contained in:
levlam 2022-11-05 01:19:56 +03:00
parent bbc3f5dace
commit ce2791fae3
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/generate/scheme/td_api.tl
View File

@ -531,7 +531,7 @@ user id:int53 first_name:string last_name:string usernames:usernames phone_numbe
botInfo share_text:string description:string photo:photo animation:animation menu_button:botMenuButton commands:vector<botCommand> default_group_administrator_rights:chatAdministratorRights default_channel_administrator_rights:chatAdministratorRights = BotInfo; botInfo share_text:string description:string photo:photo animation:animation menu_button:botMenuButton commands:vector<botCommand> default_group_administrator_rights:chatAdministratorRights default_channel_administrator_rights:chatAdministratorRights = BotInfo;
//@description Contains full information about a user //@description Contains full information about a user
//@photo User profile photo; may be null if empty or unknown //@photo User profile photo; may be null if empty or unknown. If non-null, then it is the same photo as in user.profile_photo and chat.photo
//@is_blocked True, if the user is blocked by the current user //@is_blocked True, if the user is blocked by the current user
//@can_be_called True, if the user can be called //@can_be_called True, if the user can be called
//@supports_video_calls True, if a video call can be created with the user //@supports_video_calls True, if a video call can be created with the user
@ -714,7 +714,7 @@ chatJoinRequestsInfo total_count:int32 user_ids:vector<int53> = ChatJoinRequests
basicGroup id:int53 member_count:int32 status:ChatMemberStatus is_active:Bool upgraded_to_supergroup_id:int53 = BasicGroup; basicGroup id:int53 member_count:int32 status:ChatMemberStatus is_active:Bool upgraded_to_supergroup_id:int53 = BasicGroup;
//@description Contains full information about a basic group //@description Contains full information about a basic group
//@photo Chat photo; may be null if empty or unknown //@photo Chat photo; may be null if empty or unknown. If non-null, then it is the same photo as in chat.photo
//@param_description Group description. Updated only after the basic group is opened //@param_description Group description. Updated only after the basic group is opened
//@creator_user_id User identifier of the creator of the group; 0 if unknown //@creator_user_id User identifier of the creator of the group; 0 if unknown
//@members Group members //@members Group members
@ -745,7 +745,7 @@ basicGroupFullInfo photo:chatPhoto description:string creator_user_id:int53 memb
supergroup id:int53 usernames:usernames date:int32 status:ChatMemberStatus member_count:int32 has_linked_chat:Bool has_location:Bool sign_messages:Bool join_to_send_messages:Bool join_by_request:Bool is_slow_mode_enabled:Bool is_channel:Bool is_broadcast_group:Bool is_forum:Bool is_verified:Bool restriction_reason:string is_scam:Bool is_fake:Bool = Supergroup; supergroup id:int53 usernames:usernames date:int32 status:ChatMemberStatus member_count:int32 has_linked_chat:Bool has_location:Bool sign_messages:Bool join_to_send_messages:Bool join_by_request:Bool is_slow_mode_enabled:Bool is_channel:Bool is_broadcast_group:Bool is_forum:Bool is_verified:Bool restriction_reason:string is_scam:Bool is_fake:Bool = Supergroup;
//@description Contains full information about a supergroup or channel //@description Contains full information about a supergroup or channel
//@photo Chat photo; may be null if empty or unknown //@photo Chat photo; may be null if empty or unknown. If non-null, then it is the same photo as in chat.photo
//@param_description Supergroup or channel description //@param_description Supergroup or channel description
//@member_count Number of members in the supergroup or channel; 0 if unknown //@member_count Number of members in the supergroup or channel; 0 if unknown
//@administrator_count Number of privileged users in the supergroup or channel; 0 if unknown //@administrator_count Number of privileged users in the supergroup or channel; 0 if unknown

64
td/telegram/ContactsManager.cpp
View File

@ -12240,7 +12240,8 @@ void ContactsManager::do_update_user_photo(User *u, UserId user_id, ProfilePhoto
<< "Update profile photo of " << user_id << " without access hash from " << source; << "Update profile photo of " << user_id << " without access hash from " << source;
u->photo = new_photo; u->photo = new_photo;
u->is_photo_changed = true; u->is_photo_changed = true;
LOG(DEBUG) << "Photo has changed for " << user_id; LOG(DEBUG) << "Photo has changed for " << user_id << " to " << u->photo
<< ", invalidate_photo_cache = " << invalidate_photo_cache;
u->is_changed = true; u->is_changed = true;
if (invalidate_photo_cache) { if (invalidate_photo_cache) {
@ -12634,6 +12635,8 @@ void ContactsManager::add_profile_photo_to_cache(UserId user_id, Photo &&photo)
return; return;
} }
LOG(INFO) << "Add prifile photo " << photo.id.get() << " to cache";
// update photo list // update photo list
auto it = user_photos_.find(user_id); auto it = user_photos_.find(user_id);
if (it != user_photos_.end() && it->second.count != -1) { if (it != user_photos_.end() && it->second.count != -1) {
@ -12650,6 +12653,11 @@ void ContactsManager::add_profile_photo_to_cache(UserId user_id, Photo &&photo)
} }
} }
// update ProfilePhoto in User
do_update_user_photo(u, user_id, as_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, photo), false,
"add_profile_photo_to_cache");
update_user(u, user_id);
// update Photo in UserFull // update Photo in UserFull
auto user_full = get_user_full_force(user_id); auto user_full = get_user_full_force(user_id);
if (user_full != nullptr) { if (user_full != nullptr) {
@ -12660,11 +12668,6 @@ void ContactsManager::add_profile_photo_to_cache(UserId user_id, Photo &&photo)
} }
update_user_full(user_full, user_id, "add_profile_photo_to_cache"); update_user_full(user_full, user_id, "add_profile_photo_to_cache");
} }
// update ProfilePhoto in User
do_update_user_photo(u, user_id, as_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, photo), false,
"add_profile_photo_to_cache");
update_user(u, user_id);
} }
bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 profile_photo_id, bool send_updates) { bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 profile_photo_id, bool send_updates) {
@ -12673,6 +12676,9 @@ bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 prof
// we have subsequence of user photos in user_photos_ // we have subsequence of user photos in user_photos_
// ProfilePhoto in User and Photo in UserFull // ProfilePhoto in User and Photo in UserFull
LOG(INFO) << "Delete prifile photo " << profile_photo_id << " from cache with" << (send_updates ? "" : "out")
<< " updates";
User *u = get_user_force(user_id); User *u = get_user_force(user_id);
bool is_main_photo_deleted = u != nullptr && u->photo.id == profile_photo_id; bool is_main_photo_deleted = u != nullptr && u->photo.id == profile_photo_id;
@ -12698,13 +12704,33 @@ bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 prof
user_photos->offset = -1; user_photos->offset = -1;
} }
} }
bool have_new_photo =
it != user_photos_.end() && it->second.count != -1 && it->second.offset == 0 && !it->second.photos.empty();
auto user_full = get_user_full_force(user_id);
if (user_full != nullptr && user_full->photo.id.get() == profile_photo_id) {
// user_full->photo is empty or coincides with u->photo
CHECK(is_main_photo_deleted);
}
// update ProfilePhoto in User
bool need_reget_user = false;
if (is_main_photo_deleted) {
if (have_new_photo) {
do_update_user_photo(u, user_id,
as_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, it->second.photos[0]),
false, "delete_profile_photo_from_cache");
} else {
do_update_user_photo(u, user_id, ProfilePhoto(), false, "delete_profile_photo_from_cache 2");
need_reget_user = it == user_photos_.end() || it->second.count != 0;
}
if (send_updates) {
update_user(u, user_id);
}
// update Photo in UserFull // update Photo in UserFull
auto user_full = get_user_full_force(user_id); if (user_full != nullptr) {
if (user_full != nullptr && !user_full->photo.is_empty() && if (have_new_photo) {
(is_main_photo_deleted || user_full->photo.id.get() == profile_photo_id)) {
if (it != user_photos_.end() && it->second.count != -1 && it->second.offset == 0 && !it->second.photos.empty()) {
// found exact new photo
if (it->second.photos[0] != user_full->photo) { if (it->second.photos[0] != user_full->photo) {
user_full->photo = it->second.photos[0]; user_full->photo = it->second.photos[0];
user_full->is_changed = true; user_full->is_changed = true;
@ -12721,22 +12747,6 @@ bool ContactsManager::delete_profile_photo_from_cache(UserId user_id, int64 prof
update_user_full(user_full, user_id, "delete_profile_photo_from_cache"); update_user_full(user_full, user_id, "delete_profile_photo_from_cache");
} }
} }
// update ProfilePhoto in User
bool need_reget_user = false;
if (is_main_photo_deleted) {
if (it != user_photos_.end() && it->second.count != -1 && it->second.offset == 0 && !it->second.photos.empty()) {
// found exact new photo
do_update_user_photo(u, user_id,
as_profile_photo(td_->file_manager_.get(), user_id, u->access_hash, it->second.photos[0]),
false, "delete_profile_photo_from_cache");
} else {
do_update_user_photo(u, user_id, ProfilePhoto(), false, "delete_profile_photo_from_cache 2");
need_reget_user = it == user_photos_.end() || it->second.count != 0;
}
if (send_updates) {
update_user(u, user_id);
}
} }
return need_reget_user; return need_reget_user;