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

GroupApplicationResponse

Browse Source
This commit is contained in:
withchao 2023-06-06 20:32:09 +08:00
parent b188083452
commit aac13ebae2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/group/group.go
View File

@ -724,7 +724,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
return nil, err return nil, err
} }
if groupRequest.HandleResult != 0 { 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 var inGroup bool
_, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.FromUserID) _, 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) { } else if !s.IsNotFound(err) {
return nil, err return nil, err
} }
user, err := s.User.GetPublicUserInfo(ctx, req.FromUserID) if _, err := s.User.GetPublicUserInfo(ctx, req.FromUserID); err != nil {
if err != nil {
return nil, err return nil, err
} }
var member *relationTb.GroupMemberModel var member *relationTb.GroupMemberModel
if (!inGroup) && req.HandleResult == constant.GroupResponseAgree { if (!inGroup) && req.HandleResult == constant.GroupResponseAgree {
member = &relationTb.GroupMemberModel{ member = &relationTb.GroupMemberModel{
GroupID: req.GroupID, GroupID: req.GroupID,
UserID: user.UserID, UserID: req.FromUserID,
Nickname: user.Nickname, Nickname: "",
FaceURL: user.FaceURL, FaceURL: "",
RoleLevel: constant.GroupOrdinaryUsers, RoleLevel: constant.GroupOrdinaryUsers,
JoinTime: time.Now(), JoinTime: time.Now(),
JoinSource: groupRequest.JoinSource, JoinSource: groupRequest.JoinSource,

1
pkg/errs/code.go
View File

@ -56,6 +56,7 @@ const (
OwnerNotAllowedQuitError = 1207 //群主不能退群 OwnerNotAllowedQuitError = 1207 //群主不能退群
GroupTypeNotSupport = 1208 GroupTypeNotSupport = 1208
GroupNoOwner = 1209 GroupNoOwner = 1209
GroupRequestHandled = 1210
// 关系链错误码 // 关系链错误码
CanNotAddYourselfError = 1301 //不能添加自己为好友 CanNotAddYourselfError = 1301 //不能添加自己为好友

1
pkg/errs/predefine.go
View File

@ -62,4 +62,5 @@ var (
ErrFileUploadedComplete = NewCodeError(FileUploadedCompleteError, "FileUploadedComplete") ErrFileUploadedComplete = NewCodeError(FileUploadedCompleteError, "FileUploadedComplete")
ErrFileUploadedExpired = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError") ErrFileUploadedExpired = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError")
ErrGroupRequestHandled = NewCodeError(GroupRequestHandled, "GroupRequestHandled")
) )