Skip to content

Commit 084797b

Browse files
authored
Fix delete user missed some comments (go-gitea#21067) (go-gitea#21068)
1 parent 7888a55 commit 084797b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

models/packages/package_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestMain(m *testing.M) {
2727
func TestHasOwnerPackages(t *testing.T) {
2828
assert.NoError(t, unittest.PrepareTestDatabase())
2929

30-
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
30+
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User)
3131

3232
p, err := packages_model.TryInsertPackage(db.DefaultContext, &packages_model.Package{
3333
OwnerID: owner.ID,

models/user.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) {
100100

101101
// Delete Comments
102102
const batchSize = 50
103-
for start := 0; ; start += batchSize {
103+
for {
104104
comments := make([]*issues_model.Comment, 0, batchSize)
105-
if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, start).Find(&comments); err != nil {
105+
if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, 0).Find(&comments); err != nil {
106106
return err
107107
}
108108
if len(comments) == 0 {
@@ -200,7 +200,7 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) {
200200
// ***** END: ExternalLoginUser *****
201201

202202
if _, err = e.ID(u.ID).Delete(new(user_model.User)); err != nil {
203-
return fmt.Errorf("Delete: %v", err)
203+
return fmt.Errorf("delete: %v", err)
204204
}
205205

206206
return nil

0 commit comments

Comments
 (0)