From f5b1f1271eb68532196e27726e1678db757726e8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 14 May 2020 11:13:48 +0800
Subject: [PATCH] 1

---
 server/imserver/handlermgr.cc          |  3 +++
 server/imserver/player.cc              | 17 ++++++++++++++++-
 server/imserver/player.h               |  3 +++
 server/tools/protobuild/cs_proto.proto | 22 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 9ea8206..1cb5a54 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -51,6 +51,9 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendApply);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendIgnore);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendDelete);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendBlackList);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendAddBlack);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendDeleteBlack);
 
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupCreate);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupJoin);
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 761dc24..c45331f 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -65,7 +65,7 @@ void Player::_CMFriendList(f8::MsgHdr& hdr, const cs::CMFriendList& msg)
 
 void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
 {
-    cs::SMFriendInvite respmsg;
+    cs::SMFriendApply respmsg;
     SendMsg(respmsg);
 }
 
@@ -91,6 +91,21 @@ void Player::_CMFriendDelete(f8::MsgHdr& hdr, const cs::CMFriendDelete& msg)
     SendMsg(respmsg);
 }
 
+void Player::_CMFriendBlackList(f8::MsgHdr& hdr, const cs::CMFriendBlackList& msg)
+{
+
+}
+
+void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg)
+{
+
+}
+
+void Player::_CMFriendDeleteBlack(f8::MsgHdr& hdr, const cs::CMFriendDeleteBlack& msg)
+{
+
+}
+
 void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
 {
     if (group_id != 0) {
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 92ac2a9..20091bd 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -42,6 +42,9 @@ class Player
     void _CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& 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);
+    void _CMFriendDeleteBlack(f8::MsgHdr& hdr, const cs::CMFriendDeleteBlack& msg);
 
     void _CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg);
     void _CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg);
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 42b9b0c..500f436 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -153,6 +153,28 @@ message SMFriendBlackList
     optional string error_msg = 2; //错误消息
 }
 
+//添加黑名单
+message CMFriendAddBlack
+{
+}
+//添加黑名单回复
+message SMFriendAddBlack
+{
+    optional int32 error_code = 1; //
+    optional string error_msg = 2; //错误消息
+}
+
+//删除黑名单
+message CMFriendDeleteBlack
+{
+}
+//删除黑名单回复
+message SMFriendDeleteBlack
+{
+    optional int32 error_code = 1; //
+    optional string error_msg = 2; //错误消息
+}
+
 //建群
 message CMGroupCreate
 {