From 04a1af2b76715625c74ffe9d028a8ba272e2e279 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 13 Jul 2020 11:25:53 +0800 Subject: [PATCH] 1 --- server/imserver/asynctaskmgr.cc | 4 ++-- server/imserver/player.cc | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/imserver/asynctaskmgr.cc b/server/imserver/asynctaskmgr.cc index 7016714..d11439b 100644 --- a/server/imserver/asynctaskmgr.cc +++ b/server/imserver/asynctaskmgr.cc @@ -72,7 +72,7 @@ struct RecommandFriendTask App::Instance()->PreProcAvatarUrl (channel, target_channel, - *p->mutable_base_data()->mutable_account_id()); + *p->mutable_base_data()->mutable_avatar_url()); } exclude_account_ids.insert(pair.first); batch_account_ids.insert(pair.first); @@ -97,7 +97,7 @@ struct RecommandFriendTask App::Instance()->PreProcAvatarUrl (channel, target_channel, - *p->mutable_base_data()->mutable_account_id()); + *p->mutable_base_data()->mutable_avatar_url()); } exclude_account_ids.insert(user_info->base_data().account_id()); batch_account_ids.insert(user_info->base_data().account_id()); diff --git a/server/imserver/player.cc b/server/imserver/player.cc index f41c425..fed325a 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -404,7 +404,7 @@ void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg) App::Instance()->PreProcAvatarUrl (channel, target_channel, - *user_info->mutable_base_data()->mutable_account_id()); + *user_info->mutable_base_data()->mutable_avatar_url()); } SendMsg(notifymsg); } @@ -433,7 +433,7 @@ void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg) App::Instance()->PreProcAvatarUrl (channel, target_channel, - *user_info->mutable_base_data()->mutable_account_id()); + *user_info->mutable_base_data()->mutable_avatar_url()); } SendMsg(notifymsg); } @@ -763,7 +763,7 @@ void Player::FillBlackList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInf App::Instance()->PreProcAvatarUrl (channel, target_channel, - *p->mutable_base_data()->mutable_account_id()); + *p->mutable_base_data()->mutable_avatar_url()); } } } @@ -793,7 +793,7 @@ void Player::FillMFUserInfo(cs::MFUserInfo* user_info) App::Instance()->PreProcAvatarUrl (channel, target_channel, - *user_info->mutable_base_data()->mutable_account_id()); + *user_info->mutable_base_data()->mutable_avatar_url()); } } @@ -902,7 +902,7 @@ void Player::FillApplyList(const cs::MFPaging& paging, cs::SMFriendApplyList& re App::Instance()->PreProcAvatarUrl (channel, target_channel, - *apply_pb->mutable_base_data()->mutable_account_id()); + *apply_pb->mutable_base_data()->mutable_avatar_url()); } } ++i; @@ -1108,7 +1108,7 @@ void Player::NotifyUserInfoUpdate(Friend* friend_data) App::Instance()->PreProcAvatarUrl (channel, target_channel, - *p->mutable_base_data()->mutable_account_id()); + *p->mutable_base_data()->mutable_avatar_url()); } SendMsg(msg); } @@ -1140,7 +1140,7 @@ void Player::SyncOtherFriend() App::Instance()->PreProcAvatarUrl (channel, target_channel, - *p->mutable_base_data()->mutable_account_id()); + *p->mutable_base_data()->mutable_avatar_url()); } for (auto& pair : friend_hash_) {