From 16f794e695ac18a3d10d150e4295979575963d13 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 19 Jun 2020 11:06:46 +0800
Subject: [PATCH] 1

---
 server/imserver/handlermgr.cc |  5 +++--
 server/imserver/player.cc     | 10 ++++++++++
 server/imserver/player.h      |  3 +++
 server/imserver/playermgr.cc  | 10 ----------
 server/imserver/playermgr.h   |  2 --
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 77d8ead..25f1401 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -51,8 +51,9 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_SendChatMsg);
     RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_SendCustomMsg);
     RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_UpdateUserInfo);
-    RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_FriendAgreeRequest);
-    RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_FriendDeleteRequest);
+
+    RegisterNetMsgHandler(&imcmsghandler, &Player::_SS_IM_FriendAgreeRequest);
+    RegisterNetMsgHandler(&imcmsghandler, &Player::_SS_IM_FriendDeleteRequest);
 
     RegisterNetMsgHandler(&wsmsghandler, &WSListener::_SS_Ping);
 
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 3d84c3b..0307ceb 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -429,6 +429,16 @@ void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg)
     #endif
 }
 
+void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)
+{
+
+}
+
+void Player::_SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg)
+{
+
+}
+
 void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg)
 {
     cs::SMLogin respmsg;
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 1526227..c3a24d7 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -89,6 +89,9 @@ class Player
     void _CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg);
     void _CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg);
 
+    void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg);
+    void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg);
+
     void ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg);
     void NotifyOnline();
     void NotifyOffline();
diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc
index d04f6ae..1ada794 100644
--- a/server/imserver/playermgr.cc
+++ b/server/imserver/playermgr.cc
@@ -56,16 +56,6 @@ void PlayerMgr::_SS_IM_SendCustomMsg(f8::MsgHdr& hdr, const ss::SS_IM_SendCustom
     }
 }
 
-void PlayerMgr::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)
-{
-
-}
-
-void PlayerMgr::_SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg)
-{
-
-}
-
 void PlayerMgr::_SS_IM_UpdateUserInfo(f8::MsgHdr& hdr, const ss::SS_IM_UpdateUserInfo& msg)
 {
     auto itr = watch_players_.find(msg.user_info().base_data().account_id());
diff --git a/server/imserver/playermgr.h b/server/imserver/playermgr.h
index 552a51a..cd1a1b9 100644
--- a/server/imserver/playermgr.h
+++ b/server/imserver/playermgr.h
@@ -34,8 +34,6 @@ class PlayerMgr : public a8::Singleton<PlayerMgr>
     void _SS_MS_PushUserList(f8::MsgHdr& hdr, const ss::SS_MS_PushUserList& msg);
     void _SS_IM_SendChatMsg(f8::MsgHdr& hdr, const ss::SS_IM_SendChatMsg& msg);
     void _SS_IM_SendCustomMsg(f8::MsgHdr& hdr, const ss::SS_IM_SendCustomMsg& msg);
-    void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg);
-    void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg);
 
     void _SS_IM_UpdateUserInfo(f8::MsgHdr& hdr, const ss::SS_IM_UpdateUserInfo& msg);