diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index 8f8396e..49891b5 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -74,6 +74,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendAgree); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendRefuse); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendDelete); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendBlackList); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendAddBlack); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMFriendDeleteBlack); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMQueryUserStatus); diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 4bb59db..cd1925b 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -342,6 +342,11 @@ void Player::_CMFriendDelete(f8::MsgHdr& hdr, const cs::CMFriendDelete& msg) GameLog::Instance()->FriendDelete(this, msg.friend_id()); } +void Player::_CMFriendBlackList(f8::MsgHdr& hdr, const cs::CMFriendBlackList& msg) +{ + +} + void Player::_CMFriendAddBlack(f8::MsgHdr& hdr, const cs::CMFriendAddBlack& msg) { diff --git a/server/imserver/player.h b/server/imserver/player.h index c2d0f44..7f41f87 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -76,6 +76,7 @@ class Player void _CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg); void _CMFriendRefuse(f8::MsgHdr& hdr, const cs::CMFriendRefuse& 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 _CMQueryUserStatus(f8::MsgHdr& hdr, const cs::CMQueryUserStatus& msg); @@ -157,5 +158,6 @@ private: int red_point_flags_ = 0; std::map friend_hash_; + std::map black_hash_; std::map apply_hash_; }; diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 738733e..e7fd59d 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -12,6 +12,7 @@ enum CMMessageId_e _CMFriendDelete = 108; _CMFriendApply = 109; _CMFriendApplyList = 110; + _CMFriendBlackList = 111; _CMFriendAddBlack = 112; _CMFriendDeleteBlack = 113; _CMFriendRefuse = 114; @@ -45,6 +46,7 @@ enum SMMessageId_e _SMFriendDelete = 108; _SMFriendApply = 109; _SMFriendApplyList = 110; + _SMFriendBlackList = 111; _SMFriendAddBlack = 112; _SMFriendDeleteBlack = 113; _SMFriendRefuse = 114; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index ab1fb81..afb5038 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -119,7 +119,6 @@ message SMFriendList optional int32 errcode = 1; //错误消息 optional string errmsg = 2; //错误消息 repeated MFUserInfo friend_list = 3; //好友列表 - repeated MFUserInfo black_list = 4; //黑名单 } //好友申请 @@ -186,6 +185,16 @@ message SMFriendDelete optional string friend_id = 3; //好友id } +//获取黑名单 +message CMFriendBlackList +{ +} +//获取黑名单回复 +message SMFriendBlackList +{ + repeated MFUserInfo black_list = 1; //黑名单 +} + //添加黑名单 message CMFriendAddBlack {