blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-27 03:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

add friend and blacklist judge

Browse Source
This commit is contained in:
Gordon 2022-03-16 11:25:44 +08:00
parent 10884b8175
commit 852d3b9f48
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/rpc/msg/send_msg.go
View File

@ -56,10 +56,9 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
reply, err := client.IsInBlackList(context.Background(), req) reply, err := client.IsInBlackList(context.Background(), req)
if err != nil { if err != nil {
log.NewDebug(data.OperationID, "IsInBlackListReq rpc failed, ", req.String(), err.Error()) log.NewDebug(data.OperationID, "IsInBlackListReq rpc failed, ", req.String(), err.Error())
return false, 600, err.Error() } else if reply.Response == true {
} else if reply.Response == false {
log.NewDebug(data.OperationID, "IsInBlackListReq ", req.String()) log.NewDebug(data.OperationID, "IsInBlackListReq ", req.String())
return reply.Response, 600, "in black list" return false, 600, "in black list"
} }
if config.Config.MessageVerify.FriendVerify { if config.Config.MessageVerify.FriendVerify {
friendReq := &rpc.IsFriendReq{CommID: &rpc.CommID{}} friendReq := &rpc.IsFriendReq{CommID: &rpc.CommID{}}
@ -70,7 +69,7 @@ func userRelationshipVerification(data *pbChat.SendMsgReq) (bool, int32, string)
friendReply, err := client.IsFriend(context.Background(), friendReq) friendReply, err := client.IsFriend(context.Background(), friendReq)
if err != nil { if err != nil {
log.NewDebug(data.OperationID, "IsFriendReq rpc failed, ", req.String(), err.Error()) log.NewDebug(data.OperationID, "IsFriendReq rpc failed, ", req.String(), err.Error())
return false, 601, err.Error() return true, 0, ""
} else if friendReply.Response == false { } else if friendReply.Response == false {
log.NewDebug(data.OperationID, "not friend ", req.String()) log.NewDebug(data.OperationID, "not friend ", req.String())
return friendReply.Response, 601, "not friend" return friendReply.Response, 601, "not friend"
@ -130,10 +129,10 @@ func (rpc *rpcChat) encapsulateMsgData(msg *sdk_ws.MsgData) {
func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.SendMsgResp, error) { func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.SendMsgResp, error) {
replay := pbChat.SendMsgResp{} replay := pbChat.SendMsgResp{}
log.NewDebug(pb.OperationID, "rpc sendMsg come here", pb.String()) log.NewDebug(pb.OperationID, "rpc sendMsg come here", pb.String())
//flag, errCode, errMsg := userRelationshipVerification(pb) flag, errCode, errMsg := userRelationshipVerification(pb)
//if !flag { if !flag {
// return returnMsg(&replay, pb, errCode, errMsg, "", 0) return returnMsg(&replay, pb, errCode, errMsg, "", 0)
//} }
//if !utils.VerifyToken(pb.Token, pb.SendID) { //if !utils.VerifyToken(pb.Token, pb.SendID) {
// return returnMsg(&replay, pb, http.StatusUnauthorized, "token validate err,not authorized", "", 0) // return returnMsg(&replay, pb, http.StatusUnauthorized, "token validate err,not authorized", "", 0)
rpc.encapsulateMsgData(pb.MsgData) rpc.encapsulateMsgData(pb.MsgData)