blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-28 21:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-03-16 14:13:45 +08:00
commit fb815c0be0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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"