Skip to content

Commit fb24c3c

Browse files
committed
fix(group): move member count retrieval after member deletion for accurate updates
1 parent b1e6f66 commit fb24c3c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

internal/rpc/group/group.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,6 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
593593
}
594594
}
595595
}
596-
num, err := s.db.FindGroupMemberNum(ctx, req.GroupID)
597-
if err != nil {
598-
return nil, err
599-
}
600596
ownerUserIDs, err := s.db.GetGroupRoleLevelMemberIDs(ctx, req.GroupID, constant.GroupOwner)
601597
if err != nil {
602598
return nil, err
@@ -608,6 +604,10 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
608604
if err := s.db.DeleteGroupMember(ctx, group.GroupID, req.KickedUserIDs); err != nil {
609605
return nil, err
610606
}
607+
num, err := s.db.FindGroupMemberNum(ctx, req.GroupID)
608+
if err != nil {
609+
return nil, err
610+
}
611611
tips := &sdkws.MemberKickedTips{
612612
Group: &sdkws.GroupInfo{
613613
GroupID: group.GroupID,
@@ -617,7 +617,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
617617
FaceURL: group.FaceURL,
618618
OwnerUserID: ownerUserID,
619619
CreateTime: group.CreateTime.UnixMilli(),
620-
MemberCount: num - uint32(len(req.KickedUserIDs)),
620+
MemberCount: num,
621621
Ex: group.Ex,
622622
Status: group.Status,
623623
CreatorUserID: group.CreatorUserID,

0 commit comments

Comments
 (0)