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

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-05-15 17:28:42 +08:00
commit ba8d14a5bf
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/common/convert/friend.go
View File

@ -53,7 +53,7 @@ func FriendsDB2Pb(ctx context.Context, friendsDB []*relation.FriendModel, getUse
return friendsPb, nil return friendsPb, nil
} }
func FriendRequestDB2Pb(ctx context.Context, friendRequests []*relation.FriendRequestModel, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) (PBFriendRequests []*sdkws.FriendRequest, err error) { func FriendRequestDB2Pb(ctx context.Context, friendRequests []*relation.FriendRequestModel, getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) ([]*sdkws.FriendRequest, error) {
userIDMap := make(map[string]struct{}) userIDMap := make(map[string]struct{})
for _, friendRequest := range friendRequests { for _, friendRequest := range friendRequests {
userIDMap[friendRequest.ToUserID] = struct{}{} userIDMap[friendRequest.ToUserID] = struct{}{}
@ -63,13 +63,25 @@ func FriendRequestDB2Pb(ctx context.Context, friendRequests []*relation.FriendRe
if err != nil { if err != nil {
return nil, err return nil, err
} }
res := make([]*sdkws.FriendRequest, 0, len(friendRequests))
for _, friendRequest := range friendRequests { for _, friendRequest := range friendRequests {
friendRequestPb := &sdkws.FriendRequest{} toUser := users[friendRequest.ToUserID]
utils.CopyStructFields(friendRequestPb, friendRequest) fromUser := users[friendRequest.FromUserID]
friendRequestPb.FromFaceURL = users[friendRequest.FromUserID].FaceURL res = append(res, &sdkws.FriendRequest{
friendRequestPb.FromNickname = users[friendRequest.FromUserID].Nickname FromUserID: friendRequest.FromUserID,
friendRequestPb.ToFaceURL = users[friendRequest.ToUserID].FaceURL FromNickname: fromUser.Nickname,
friendRequestPb.ToNickname = users[friendRequest.ToUserID].Nickname FromFaceURL: fromUser.FaceURL,
ToUserID: friendRequest.ToUserID,
ToNickname: toUser.Nickname,
ToFaceURL: toUser.FaceURL,
HandleResult: friendRequest.HandleResult,
ReqMsg: friendRequest.ReqMsg,
CreateTime: friendRequest.CreateTime.UnixMilli(),
HandlerUserID: friendRequest.HandlerUserID,
HandleMsg: friendRequest.HandleMsg,
HandleTime: friendRequest.HandleTime.UnixMilli(),
Ex: friendRequest.Ex,
})
} }
return PBFriendRequests, nil return res, nil
} }