Merge branch 'openimsdk:main' into main

This commit is contained in:
chao 2024-03-07 10:18:40 +08:00 committed by GitHub
commit c2009ceff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -757,7 +757,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup
return nil, errs.ErrGroupRequestHandled.Wrap("group request already processed")
}
var inGroup bool
if _, takeErr := s.db.TakeGroupMember(ctx, req.GroupID, req.FromUserID); takeErr == nil {
if _, err := s.db.TakeGroupMember(ctx, req.GroupID, req.FromUserID); err == nil {
inGroup = true // Already in group
} else if !s.IsNotFound(err) {
return nil, err