From 8f80a17088b29dc8956f5b45c06bec6689831fcb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 24 Jun 2020 15:05:58 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc | 6 +++---
 server/imserver/player.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 3d6a47a..4313a0a 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -302,7 +302,7 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg)
          AccountId(),
          1
          );
-    ClearApplyByTarget(msg.apply().target_id());
+    ClearApplyBySenderId(msg.apply().base_data().account_id());
 }
 
 void Player::_CMFriendRefuse(f8::MsgHdr& hdr, const cs::CMFriendRefuse& msg)
@@ -1118,11 +1118,11 @@ void Player::ClearApplyByIdx(long long idx)
     }
 }
 
-void Player::ClearApplyByTarget(const std::string& target_id)
+void Player::ClearApplyBySenderId(const std::string& sender_id)
 {
     std::vector<long long> deleted_applys;
     for (auto& pair : apply_hash_) {
-        if (pair.second->target_id == target_id) {
+        if (pair.second->base_data.account_id == sender_id) {
             deleted_applys.push_back(pair.first);
         }
     }
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 218d833..07bfc63 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -132,7 +132,7 @@ private:
     void OnDailyReset();
     void RecalcRedPoint();
     void ClearApplyByIdx(long long idx);
-    void ClearApplyByTarget(const std::string& target_id);
+    void ClearApplyBySenderId(const std::string& sender_id);
     void RefreshFriendData();
     void RemoveHandledApply();
     void QueryUserOnline(std::vector<std::string> account_ids);