|
|
@ -258,7 +258,7 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
|
|
|
|
_, err = imdb.GetFriendRelationshipFromFriend(req.CommID.ToUserID, req.CommID.FromUserID)
|
|
|
|
_, err = imdb.GetFriendRelationshipFromFriend(req.CommID.ToUserID, req.CommID.FromUserID)
|
|
|
|
if err == nil {
|
|
|
|
if err == nil {
|
|
|
|
log.NewWarn(req.CommID.OperationID, "FindFriendRelationshipFromFriend exist", req.CommID.ToUserID, req.CommID.FromUserID)
|
|
|
|
log.NewWarn(req.CommID.OperationID, "FindFriendRelationshipFromFriend exist", req.CommID.ToUserID, req.CommID.FromUserID)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
toInsertFollow := imdb.Friend{OwnerUserID: req.CommID.ToUserID, FriendUserID: req.CommID.FromUserID, OperatorUserID: req.CommID.OpUserID}
|
|
|
|
toInsertFollow := imdb.Friend{OwnerUserID: req.CommID.ToUserID, FriendUserID: req.CommID.FromUserID, OperatorUserID: req.CommID.OpUserID}
|
|
|
|
err = imdb.InsertToFriend(&toInsertFollow)
|
|
|
|
err = imdb.InsertToFriend(&toInsertFollow)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
@ -267,6 +267,7 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF
|
|
|
|
}
|
|
|
|
}
|
|
|
|
chat.FriendAddedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
|
|
|
|
chat.FriendAddedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
chat.FriendApplicationProcessedNotification(req)
|
|
|
|
chat.FriendApplicationProcessedNotification(req)
|
|
|
|
log.NewInfo(req.CommID.OperationID, "rpc AddFriendResponse ok")
|
|
|
|
log.NewInfo(req.CommID.OperationID, "rpc AddFriendResponse ok")
|
|
|
|