diff options
| author | Giteabot <teabot@gitea.io> | 2024-04-01 12:58:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 12:58:46 +0800 |
| commit | 98a81bef17b7aaa1f88db597f86d1f40cd926566 (patch) | |
| tree | d85aeec94a19e52a7104ca50484943a4196ca1eb /models | |
| parent | e579ddc31f6d6d0406f1c5330f2a31b9707fb3e2 (diff) | |
| download | gitea-98a81bef17b7aaa1f88db597f86d1f40cd926566.tar.gz gitea-98a81bef17b7aaa1f88db597f86d1f40cd926566.zip | |
Refactor DeleteInactiveUsers, fix bug and add tests (#30206) (#30222)
Backport #30206 by wxiaoguang
1. check `IsActive` before calling `IsLastAdminUser`.
2. Fix some comments and error messages.
3. Don't `return err` if "removing file" fails in `DeleteUser`.
4. Remove incorrect `DeleteInactiveEmailAddresses`. Active users could
also have inactive emails, and inactive emails do not support
"olderThan"
5. Add tests
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/user/email_address.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/models/user/email_address.go b/models/user/email_address.go index d26549f383..08771efe99 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -256,14 +256,6 @@ func IsEmailUsed(ctx context.Context, email string) (bool, error) { return db.GetEngine(ctx).Where("lower_email=?", strings.ToLower(email)).Get(&EmailAddress{}) } -// DeleteInactiveEmailAddresses deletes inactive email addresses -func DeleteInactiveEmailAddresses(ctx context.Context) error { - _, err := db.GetEngine(ctx). - Where("is_activated = ?", false). - Delete(new(EmailAddress)) - return err -} - // ActivateEmail activates the email address to given user. func ActivateEmail(ctx context.Context, email *EmailAddress) error { ctx, committer, err := db.TxContext(ctx) |