From 48e1d01d6d1b838659e2308f7af57f2e2a2e03b7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Jun 2020 19:06:53 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc              | 18 ++++++++++++++++++
 server/imserver/player.h               |  1 +
 server/tools/protobuild/cs_msgid.proto |  2 ++
 server/tools/protobuild/cs_proto.proto | 12 ++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 2723684..8c30514 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -256,6 +256,24 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
 void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg)
 {
     cs::SMFriendAgree respmsg;
+    if (GetFriendById(msg.apply().account_id())) {
+        respmsg.set_errcode(0);
+        respmsg.set_errmsg("");
+        SendMsg(respmsg);
+        return;
+    }
+    if (msg.apply().account_id() == AccountId()) {
+        respmsg.set_errcode(2);
+        respmsg.set_errmsg("不能添加自己");
+        SendMsg(respmsg);
+        return;
+    }
+    SendMsg(respmsg);
+}
+
+void Player::_CMFriendRefuse(f8::MsgHdr& hdr, const cs::CMFriendRefuse& msg)
+{
+    cs::SMFriendRefuse respmsg;
     SendMsg(respmsg);
 }
 
diff --git a/server/imserver/player.h b/server/imserver/player.h
index b7be3c3..03d2a95 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -72,6 +72,7 @@ class Player
     void _CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg);
     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);
diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index 77bfd4e..f1acccf 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -17,6 +17,7 @@ enum CMMessageId_e
     _CMFriendBlackList = 111;
     _CMFriendAddBlack = 112;
     _CMFriendDeleteBlack = 113;
+    _CMFriendRefuse = 114;
 
     _CMSendChatMsg = 151;
     _CMSendCustomMsg = 152;
@@ -49,6 +50,7 @@ enum SMMessageId_e
     _SMFriendBlackList = 111;
     _SMFriendAddBlack = 112;
     _SMFriendDeleteBlack = 113;
+    _SMFriendRefuse = 114;
 
     _SMGroupCreate = 201;
     _SMGroupJoin = 202;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 06d9d37..51fa99c 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -157,6 +157,18 @@ message SMFriendIgnore
     optional string errmsg = 2; //错误消息
 }
 
+//拒绝好友申请
+message CMFriendRefuse
+{
+    optional MFFriendApply apply = 1; //申请信息
+}
+//拒绝好友申请回复
+message SMFriendRefuse
+{
+    optional int32 errcode = 1; //错误码
+    optional string errmsg = 2; //错误消息
+}
+
 //删除好友
 message CMFriendDelete
 {