IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-16 06:49: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:
Gordon
2022-02-14 09:44:18 +08:00
parent 1539c0b2f2 a5ed6d897c
commit 6bfbf37749
2 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/friend/firend.go
+37 -36
View File
@@ -106,7 +106,7 @@ func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq
// {openIM001 openIM002 0 test add friend 0001-01-01 00:00:00 +0000 UTC 0001-01-01 00:00:00 +0000 UTC }]
log.NewDebug(req.CommID.OperationID, "UpdateFriendApplication args ", friendRequest)
//err := imdb.InsertFriendApplication(&friendRequest)
err := imdb.InsertFriendApplication(&friendRequest)
err := imdb.InsertFriendApplication(&friendRequest, map[string]interface{}{"handle_result": 0})
if err != nil {
log.NewError(req.CommID.OperationID, "UpdateFriendApplication failed ", err.Error(), friendRequest)
return &pbFriend.AddFriendResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil
@@ -405,24 +405,25 @@ func (s *friendServer) GetFriendApplyList(ctx context.Context, req *pbFriend.Get
var appleUserList []*sdkws.FriendRequest
for _, applyUserInfo := range ApplyUsersInfo {
var userInfo sdkws.FriendRequest
utils.CopyStructFields(&userInfo, applyUserInfo)
u, err := imdb.GetUserByUserID(userInfo.FromUserID)
if err != nil {
log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.FromUserID)
continue
}
userInfo.FromNickname = u.Nickname
userInfo.FromFaceURL = u.FaceURL
userInfo.FromGender = u.Gender
u, err = imdb.GetUserByUserID(userInfo.ToUserID)
if err != nil {
log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID)
continue
}
userInfo.ToNickname = u.Nickname
userInfo.ToFaceURL = u.FaceURL
userInfo.ToGender = u.Gender
cp.FriendRequestDBCopyOpenIM(&userInfo, &applyUserInfo)
// utils.CopyStructFields(&userInfo, applyUserInfo)
// u, err := imdb.GetUserByUserID(userInfo.FromUserID)
// if err != nil {
// log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.FromUserID)
// continue
// }
// userInfo.FromNickname = u.Nickname
// userInfo.FromFaceURL = u.FaceURL
// userInfo.FromGender = u.Gender
//
// u, err = imdb.GetUserByUserID(userInfo.ToUserID)
// if err != nil {
// log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID)
// continue
// }
// userInfo.ToNickname = u.Nickname
// userInfo.ToFaceURL = u.FaceURL
// userInfo.ToGender = u.Gender
appleUserList = append(appleUserList, &userInfo)
}
@@ -448,23 +449,23 @@ func (s *friendServer) GetSelfApplyList(ctx context.Context, req *pbFriend.GetSe
for _, selfApplyOtherUserInfo := range usersInfo {
var userInfo sdkws.FriendRequest // pbFriend.ApplyUserInfo
cp.FriendRequestDBCopyOpenIM(&userInfo, &selfApplyOtherUserInfo)
u, err := imdb.GetUserByUserID(userInfo.FromUserID)
if err != nil {
log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.FromUserID)
continue
}
userInfo.FromNickname = u.Nickname
userInfo.FromFaceURL = u.FaceURL
userInfo.FromGender = u.Gender
u, err = imdb.GetUserByUserID(userInfo.ToUserID)
if err != nil {
log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID)
continue
}
userInfo.ToNickname = u.Nickname
userInfo.ToFaceURL = u.FaceURL
userInfo.ToGender = u.Gender
//u, err := imdb.GetUserByUserID(userInfo.FromUserID)
//if err != nil {
// log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.FromUserID)
// continue
//}
//userInfo.FromNickname = u.Nickname
//userInfo.FromFaceURL = u.FaceURL
//userInfo.FromGender = u.Gender
//
//u, err = imdb.GetUserByUserID(userInfo.ToUserID)
//if err != nil {
// log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID)
// continue
//}
//userInfo.ToNickname = u.Nickname
//userInfo.ToFaceURL = u.FaceURL
//userInfo.ToGender = u.Gender
selfApplyOtherUserList = append(selfApplyOtherUserList, &userInfo)
}