diff --git a/src/api/chat/send_msg.go b/src/api/chat/send_msg.go index c39f4a74f..1ed48f3e1 100644 --- a/src/api/chat/send_msg.go +++ b/src/api/chat/send_msg.go @@ -17,7 +17,7 @@ type paramsUserSendMsg struct { ReqIdentifier int32 `json:"reqIdentifier" binding:"required"` PlatformID int32 `json:"platformID" binding:"required"` SendID string `json:"sendID" binding:"required"` - SenderNickName string `json:"senderNickName"` + SenderNickName string `json:"senderNickName" binding:"required"` SenderFaceURL string `json:"senderFaceUrl"` OperationID string `json:"operationID" binding:"required"` Data struct { diff --git a/src/rpc/friend/friend/add_friend_response.go b/src/rpc/friend/friend/add_friend_response.go index f372f03a6..e8a0b1189 100644 --- a/src/rpc/friend/friend/add_friend_response.go +++ b/src/rpc/friend/friend/add_friend_response.go @@ -51,19 +51,19 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF log.Error(req.Token, req.OperationID, "err=%s,create friendship failed", err.Error()) } //Push message when establish friends successfully - //senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID) - //if errSend == nil { - // logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{ - // SendID: claims.UID, - // RecvID: req.Uid, - // Content: content_struct.NewContentStructString(1, "", senderInfo.Name+" agreed to add you as a friend."), - // SendTime: utils.GetCurrentTimestampBySecond(), - // MsgFrom: constant.UserMsgType, //Notification message identification - // ContentType: constant.AcceptFriendApplicationTip, //Add friend flag - // SessionType: constant.SingleChatType, - // OperationID: req.OperationID, - // }) - //} + senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID) + if errSend == nil { + logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{ + SendID: claims.UID, + RecvID: req.Uid, + Content: content_struct.NewContentStructString(1, "", senderInfo.Name+" agreed to add you as a friend."), + SendTime: utils.GetCurrentTimestampBySecond(), + MsgFrom: constant.UserMsgType, //Notification message identification + ContentType: constant.AcceptFriendApplicationTip, //Add friend flag + SessionType: constant.SingleChatType, + OperationID: req.OperationID, + }) + } } if req.Flag == constant.RefuseFriendFlag { senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID)