diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index ebd08a59c..84c13e88f 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -724,7 +724,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup return nil, err } if groupRequest.HandleResult != 0 { - return nil, errs.ErrArgs.Wrap("group request already processed") + return nil, errs.ErrGroupRequestHandled.Wrap("group request already processed") } var inGroup bool _, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.FromUserID) @@ -733,17 +733,16 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } else if !s.IsNotFound(err) { return nil, err } - user, err := s.User.GetPublicUserInfo(ctx, req.FromUserID) - if err != nil { + if _, err := s.User.GetPublicUserInfo(ctx, req.FromUserID); err != nil { return nil, err } var member *relationTb.GroupMemberModel if (!inGroup) && req.HandleResult == constant.GroupResponseAgree { member = &relationTb.GroupMemberModel{ GroupID: req.GroupID, - UserID: user.UserID, - Nickname: user.Nickname, - FaceURL: user.FaceURL, + UserID: req.FromUserID, + Nickname: "", + FaceURL: "", RoleLevel: constant.GroupOrdinaryUsers, JoinTime: time.Now(), JoinSource: groupRequest.JoinSource, diff --git a/pkg/errs/code.go b/pkg/errs/code.go index 0a5b932f0..a17c09afa 100644 --- a/pkg/errs/code.go +++ b/pkg/errs/code.go @@ -56,6 +56,7 @@ const ( OwnerNotAllowedQuitError = 1207 //群主不能退群 GroupTypeNotSupport = 1208 GroupNoOwner = 1209 + GroupRequestHandled = 1210 // 关系链错误码 CanNotAddYourselfError = 1301 //不能添加自己为好友 diff --git a/pkg/errs/predefine.go b/pkg/errs/predefine.go index 5b7cfbd88..3fee637eb 100644 --- a/pkg/errs/predefine.go +++ b/pkg/errs/predefine.go @@ -62,4 +62,5 @@ var ( ErrFileUploadedComplete = NewCodeError(FileUploadedCompleteError, "FileUploadedComplete") ErrFileUploadedExpired = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError") + ErrGroupRequestHandled = NewCodeError(GroupRequestHandled, "GroupRequestHandled") )