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

DismissGroup

Browse Source
This commit is contained in:
withchao 2023-06-06 11:43:00 +08:00
parent edcd883b10
commit d968c1f976
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1105,9 +1105,8 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
if err != nil { if err != nil {
return nil, err return nil, err
} }
userIDs, err := s.GroupDatabase.FindGroupMemberUserID(ctx, req.GroupID) if req.DeleteMember == false && group.Status == constant.GroupStatusDismissed {
if err != nil { return nil, errs.ErrDismissedAlready.Wrap("group status is dismissed")
return nil, err
} }
//if group.Status == constant.GroupStatusDismissed { //if group.Status == constant.GroupStatusDismissed {
// return nil, errs.ErrArgs.Wrap("group status is dismissed") // return nil, errs.ErrArgs.Wrap("group status is dismissed")
@ -1121,6 +1120,10 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou
} }
} else { } else {
if !req.DeleteMember { if !req.DeleteMember {
userIDs, err := s.GroupDatabase.FindGroupMemberUserID(ctx, req.GroupID)
if err != nil {
return nil, err
}
//s.Notification.GroupDismissedNotification(ctx, req) //s.Notification.GroupDismissedNotification(ctx, req)
tips := &sdkws.GroupDismissedTips{ tips := &sdkws.GroupDismissedTips{
Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))), Group: s.groupDB2PB(group, owner.UserID, uint32(len(userIDs))),