From 8ad368404ab8680eb2cd8b869a4489303e0074d8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 18 Jun 2020 16:51:17 +0800
Subject: [PATCH] 1

---
 server/imserver/handlermgr.cc          |  1 -
 server/imserver/player.cc              | 23 +++++++----------------
 server/imserver/player.h               |  1 -
 server/tools/protobuild/cs_msgid.proto |  2 --
 server/tools/protobuild/cs_proto.proto | 12 ------------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 32d1c2f..0f5bf11 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -60,7 +60,6 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendApply);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendApplyList);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendAgree);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendIgnore);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendRefuse);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendDelete);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendBlackList);
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index d96233d..76cf7a9 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -223,6 +223,12 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg)
         respmsg.set_errcode(0);
         respmsg.set_errmsg("");
         SendMsg(respmsg);
+        DBHelper::Instance()->SetFriendApplyStatus(
+             myself.crc32_code,
+             msg.apply().target_id(),
+             AccountId(),
+             1
+             );
         return;
     }
     if (msg.apply().base_data().account_id() == AccountId()) {
@@ -236,7 +242,7 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg)
     if (AddFriend(friendobj) == 0) {
         NotifyUserInfoUpdate(friendobj);
     } else {
-        delete friendobj;
+        A8_SAFE_DELETE(friendobj);
     }
     SendMsg(respmsg);
     MarkDirty();
@@ -273,21 +279,6 @@ void Player::_CMFriendRefuse(f8::MsgHdr& hdr, const cs::CMFriendRefuse& msg)
          );
 }
 
-void Player::_CMFriendIgnore(f8::MsgHdr& hdr, const cs::CMFriendIgnore& msg)
-{
-    cs::SMFriendIgnore respmsg;
-    SendMsg(respmsg);
-
-    DBHelper::Instance()->SetFriendApplyStatus
-        (
-         myself.crc32_code,
-         msg.apply().idx(),
-         msg.apply().target_id(),
-         AccountId(),
-         3
-         );
-}
-
 void Player::_CMFriendDelete(f8::MsgHdr& hdr, const cs::CMFriendDelete& msg)
 {
     cs::SMFriendDelete respmsg;
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 253867d..4fa29b0 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -73,7 +73,6 @@ class Player
     void _CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& msg);
     void _CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg);
     void _CMFriendRefuse(f8::MsgHdr& hdr, const cs::CMFriendRefuse& msg);
-    void _CMFriendIgnore(f8::MsgHdr& hdr, const cs::CMFriendIgnore& msg);
     void _CMFriendDelete(f8::MsgHdr& hdr, const cs::CMFriendDelete& msg);
     void _CMFriendBlackList(f8::MsgHdr& hdr, const cs::CMFriendBlackList& msg);
     void _CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg);
diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index 2c8ca3d..ca8386a 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -10,7 +10,6 @@ enum CMMessageId_e
     _CMFriendList = 104;
     _CMFriendInvite = 105;
     _CMFriendAgree = 106;
-    _CMFriendIgnore = 107;
     _CMFriendDelete = 108;
     _CMFriendApply = 109;
     _CMFriendApplyList = 110;
@@ -43,7 +42,6 @@ enum SMMessageId_e
     _SMFriendList = 104;
     _SMFriendInvite = 105;
     _SMFriendAgree = 106;
-    _SMFriendIgnore = 107;
     _SMFriendDelete = 108;
     _SMFriendApply = 109;
     _SMFriendApplyList = 110;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index e88412e..e748ce6 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -146,18 +146,6 @@ message SMFriendAgree
     optional string errmsg = 2; //错误消息
 }
 
-//忽略好友申请
-message CMFriendIgnore
-{
-    optional MFFriendApply apply = 1; //申请信息
-}
-//忽略好友申请回复
-message SMFriendIgnore
-{
-    optional int32 errcode = 1; //错误码
-    optional string errmsg = 2; //错误消息
-}
-
 //拒绝好友申请
 message CMFriendRefuse
 {