blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-29 13:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "friend modify"

Browse Source 
This reverts commit b398ec98
This commit is contained in:
Gordon 2021-07-02 18:11:33 +08:00
parent b398ec98e1
commit ba0ac9b604
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/chat/send_msg.go
View File

@ -17,7 +17,7 @@ type paramsUserSendMsg struct {
ReqIdentifier int32 `json:"reqIdentifier" binding:"required"` ReqIdentifier int32 `json:"reqIdentifier" binding:"required"`
PlatformID int32 `json:"platformID" binding:"required"` PlatformID int32 `json:"platformID" binding:"required"`
SendID string `json:"sendID" binding:"required"` SendID string `json:"sendID" binding:"required"`
SenderNickName string `json:"senderNickName"` SenderNickName string `json:"senderNickName" binding:"required"`
SenderFaceURL string `json:"senderFaceUrl"` SenderFaceURL string `json:"senderFaceUrl"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
Data struct { Data struct {

26
src/rpc/friend/friend/add_friend_response.go
View File

@ -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()) log.Error(req.Token, req.OperationID, "err=%s,create friendship failed", err.Error())
} }
//Push message when establish friends successfully //Push message when establish friends successfully
//senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID) senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID)
//if errSend == nil { if errSend == nil {
// logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{ logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
// SendID: claims.UID, SendID: claims.UID,
// RecvID: req.Uid, RecvID: req.Uid,
// Content: content_struct.NewContentStructString(1, "", senderInfo.Name+" agreed to add you as a friend."), Content: content_struct.NewContentStructString(1, "", senderInfo.Name+" agreed to add you as a friend."),
// SendTime: utils.GetCurrentTimestampBySecond(), SendTime: utils.GetCurrentTimestampBySecond(),
// MsgFrom: constant.UserMsgType, //Notification message identification MsgFrom: constant.UserMsgType, //Notification message identification
// ContentType: constant.AcceptFriendApplicationTip, //Add friend flag ContentType: constant.AcceptFriendApplicationTip, //Add friend flag
// SessionType: constant.SingleChatType, SessionType: constant.SingleChatType,
// OperationID: req.OperationID, OperationID: req.OperationID,
// }) })
//} }
} }
if req.Flag == constant.RefuseFriendFlag { if req.Flag == constant.RefuseFriendFlag {
senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID) senderInfo, errSend := im_mysql_model.FindUserByUID(claims.UID)