Merge remote-tracking branch 'origin/errcode' into errcode

2026-05-12 21:16:00 +08:00 · 2023-04-19 15:12:18 +08:00
parent df7c98e27d b7de5c46cf
commit 2b58579c0a
3 changed files with 6 additions and 2 deletions
@@ -634,7 +634,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq)
 	_, err = s.GroupDatabase.TakeGroupMember(ctx, req.GroupID, req.InviterUserID)
 	if err == nil {
 		return nil, errs.ErrArgs.Wrap("already in group")
-	} else if !s.IsNotFound(err) {
+	} else if !s.IsNotFound(err) && utils.Unwrap(err) != errs.ErrRecordNotFound {
 		return nil, err
 	}
 	resp = &pbGroup.JoinGroupResp{}