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

GroupApplicationResponse

Browse Source
This commit is contained in:
withchao 2023-06-06 15:41:23 +08:00
parent d968c1f976
commit 485abaa8f3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,10 +717,10 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
if groupRequest.HandleResult != 0 { if groupRequest.HandleResult != 0 {
return nil, errs.ErrArgs.Wrap("group request already processed") return nil, errs.ErrArgs.Wrap("group request already processed")
} }
var join bool var inGroup bool
_, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.FromUserID) _, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.FromUserID)
if err == nil { if err == nil {
join = true // 已经在群里了 inGroup = true // 已经在群里了
} else if !s.IsNotFound(err) { } else if !s.IsNotFound(err) {
return nil, err return nil, err
} }
@ -729,7 +729,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
return nil, err return nil, err
} }
var member *relationTb.GroupMemberModel var member *relationTb.GroupMemberModel
if (!join) && 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: user.UserID,
@ -750,14 +750,20 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
if err := s.GroupDatabase.HandlerGroupRequest(ctx, req.GroupID, req.FromUserID, req.HandledMsg, req.HandleResult, member); err != nil { if err := s.GroupDatabase.HandlerGroupRequest(ctx, req.GroupID, req.FromUserID, req.HandledMsg, req.HandleResult, member); err != nil {
return nil, err return nil, err
} }
if !join { switch req.HandleResult {
if req.HandleResult == constant.GroupResponseAgree { case constant.GroupResponseAgree:
s.Notification.GroupApplicationAcceptedNotification(ctx, req) s.Notification.GroupApplicationAcceptedNotification(ctx, req)
s.Notification.MemberEnterNotification(ctx, req) case constant.GroupResponseRefuse:
} else if req.HandleResult == constant.GroupResponseRefuse {
s.Notification.GroupApplicationRejectedNotification(ctx, req) s.Notification.GroupApplicationRejectedNotification(ctx, req)
} }
} //if !inGroup {
// if req.HandleResult == constant.GroupResponseAgree {
// s.Notification.GroupApplicationAcceptedNotification(ctx, req)
// s.Notification.MemberEnterNotification(ctx, req)
// } else if req.HandleResult == constant.GroupResponseRefuse {
// s.Notification.GroupApplicationRejectedNotification(ctx, req)
// }
//}
return &pbGroup.GroupApplicationResponseResp{}, nil return &pbGroup.GroupApplicationResponseResp{}, nil
} }