blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-05 03:42:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

group

Browse Source
This commit is contained in:
withchao 2024-06-19 16:52:44 +08:00
parent 08cb4a948d
commit f613c6dfc9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/rpc/group/sync.go
View File

@ -63,6 +63,7 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
if group.Status == constant.GroupStatusDismissed { if group.Status == constant.GroupStatusDismissed {
return nil, servererrs.ErrDismissedAlready.Wrap() return nil, servererrs.ErrDismissedAlready.Wrap()
} }
var hasGroupUpdate bool
opt := incrversion.Option[*sdkws.GroupMemberFullInfo, pbgroup.GetIncrementalGroupMemberResp]{ opt := incrversion.Option[*sdkws.GroupMemberFullInfo, pbgroup.GetIncrementalGroupMemberResp]{
Ctx: ctx, Ctx: ctx,
VersionKey: req.GroupID, VersionKey: req.GroupID,
@ -73,17 +74,14 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
if err != nil { if err != nil {
return nil, err return nil, err
} }
var ok bool
vl.Logs = slices.DeleteFunc(vl.Logs, func(elem model.VersionLogElem) bool { vl.Logs = slices.DeleteFunc(vl.Logs, func(elem model.VersionLogElem) bool {
if elem.EID == "" { if elem.EID == "" {
ok = true vl.LogLen--
hasGroupUpdate = true
return true return true
} }
return false return false
}) })
if !ok {
group = nil
}
return vl, nil return vl, nil
}, },
CacheMaxVersion: s.db.FindMaxGroupMemberVersionCache, CacheMaxVersion: s.db.FindMaxGroupMemberVersionCache,
@ -106,7 +104,7 @@ func (s *groupServer) GetIncrementalGroupMember(ctx context.Context, req *pbgrou
if err != nil { if err != nil {
return nil, err return nil, err
} }
if group != nil { if resp.Full || hasGroupUpdate {
count, err := s.db.FindGroupMemberNum(ctx, group.GroupID) count, err := s.db.FindGroupMemberNum(ctx, group.GroupID)
if err != nil { if err != nil {
return nil, err return nil, err