diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 0aa047cef..87f2e8935 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -160,13 +160,13 @@ func (s *friendServer) ImportFriend(ctx context.Context, req *pbFriend.ImportFri if err := token_verify.CheckAdmin(ctx); err != nil { return nil, err } - if _, err := GetUsersInfo(ctx, []string{req.FromUserID}); err != nil { + if _, err := GetUsersInfo(ctx, []string{req.OwnerUserID}); err != nil { return nil, err } var friends []*relation.Friend - for _, userID := range utils.RemoveDuplicateElement(req.FriendUserIDList) { - friends = append(friends, &relation.Friend{OwnerUserID: userID, FriendUserID: req.FromUserID, AddSource: constant.BecomeFriendByImport, OperatorUserID: tools.OpUserID(ctx)}) + for _, userID := range utils.RemoveDuplicateElement(req.FriendUserIDs) { + friends = append(friends, &relation.Friend{OwnerUserID: userID, FriendUserID: req.OwnerUserID, AddSource: constant.BecomeFriendByImport, OperatorUserID: tools.OpUserID(ctx)}) } if len(friends) > 0 { if err := s.FriendInterface.BecomeFriend(ctx, friends); err != nil { diff --git a/pkg/utils/convert.go b/pkg/utils/convert.go index 5ed75c7a0..0acbcd6d5 100644 --- a/pkg/utils/convert.go +++ b/pkg/utils/convert.go @@ -41,18 +41,18 @@ func (db *DBFriend) convert() (*sdk.FriendInfo, error) { if err != nil { return nil, err } - utils2.CopyStructFields(pbFriend.FriendUser, user[0]) - pbFriend.CreateTime = uint32(db.CreateTime.Unix()) + CopyStructFields(pbFriend.FriendUser, user[0]) + pbFriend.CreateTime = db.CreateTime.Unix() - pbFriend.FriendUser.CreateTime = uint32(db.CreateTime.Unix()) + pbFriend.FriendUser.CreateTime = db.CreateTime.Unix() return pbFriend, nil } func (pb *PBFriend) Convert() (*relation.Friend, error) { dbFriend := &relation.Friend{} - utils2.CopyStructFields(dbFriend, pb) + CopyStructFields(dbFriend, pb) dbFriend.FriendUserID = pb.FriendUser.UserID - dbFriend.CreateTime = utils2.UnixSecondToTime(int64(pb.CreateTime)) + dbFriend.CreateTime = UnixSecondToTime(pb.CreateTime) return dbFriend, nil } @@ -96,8 +96,8 @@ func (db *DBFriendRequest) Convert() (*sdk.FriendRequest, error) { pbFriendRequest.ToNickname = user[0].Nickname pbFriendRequest.ToFaceURL = user[0].FaceURL pbFriendRequest.ToGender = user[0].Gender - pbFriendRequest.CreateTime = uint32(db.CreateTime.Unix()) - pbFriendRequest.HandleTime = uint32(db.HandleTime.Unix()) + pbFriendRequest.CreateTime = db.CreateTime.Unix() + pbFriendRequest.HandleTime = db.HandleTime.Unix() return pbFriendRequest, nil } @@ -170,8 +170,8 @@ func (db *DBGroup) Convert() (*sdk.GroupInfo, error) { return nil, err } dst.MemberCount = uint32(memberCount) - dst.CreateTime = uint32(db.CreateTime.Unix()) - dst.NotificationUpdateTime = uint32(db.NotificationUpdateTime.Unix()) + dst.CreateTime = db.CreateTime.Unix() + dst.NotificationUpdateTime = db.NotificationUpdateTime.Unix() if db.NotificationUpdateTime.Unix() < 0 { dst.NotificationUpdateTime = 0 } @@ -211,12 +211,12 @@ func (db *DBGroupMember) Convert() (*sdk.GroupMemberFullInfo, error) { } dst.AppMangerLevel = user[0].AppMangerLevel - dst.JoinTime = int32(db.JoinTime.Unix()) + dst.JoinTime = db.JoinTime.Unix() if db.JoinTime.Unix() < 0 { dst.JoinTime = 0 } - dst.MuteEndTime = uint32(db.MuteEndTime.Unix()) - if dst.MuteEndTime < uint32(time.Now().Unix()) { + dst.MuteEndTime = db.MuteEndTime.Unix() + if dst.MuteEndTime < time.Now().Unix() { dst.MuteEndTime = 0 } return dst, nil