From 8a0f117cd250aa46c1bbfe3665363e9ad9083ee6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 5 Sep 2022 10:57:17 +0800 Subject: [PATCH 1/2] Fix delete user missed some comments --- models/user.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/user.go b/models/user.go index fceb5aabeca5..c5766cb91c79 100644 --- a/models/user.go +++ b/models/user.go @@ -102,9 +102,9 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) (err error) // Delete Comments const batchSize = 50 - for start := 0; ; start += batchSize { - comments := make([]*issues_model.Comment, 0, batchSize) - if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, start).Find(&comments); err != nil { + for { + comments := make([]*issues_model.Comment, 0, 50) + if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, 0).Find(&comments); err != nil { return err } if len(comments) == 0 { @@ -202,7 +202,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) (err error) // ***** END: ExternalLoginUser ***** if _, err = e.ID(u.ID).Delete(new(user_model.User)); err != nil { - return fmt.Errorf("Delete: %v", err) + return fmt.Errorf("delete: %v", err) } return nil From 4a6c96ec2c5c2af962d1b783c372827b60347cc4 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 5 Sep 2022 17:15:56 +0100 Subject: [PATCH 2/2] Update models/user.go --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index c5766cb91c79..68be0d855509 100644 --- a/models/user.go +++ b/models/user.go @@ -103,7 +103,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) (err error) // Delete Comments const batchSize = 50 for { - comments := make([]*issues_model.Comment, 0, 50) + comments := make([]*issues_model.Comment, 0, batchSize) if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, 0).Find(&comments); err != nil { return err }