1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-01-02 14:28:52 -05:00

Fix GetInactiveUsers (#32540)

Fix #31480

(cherry picked from commit 9bf821ae6c108379d22ae11d8d5784a4ed7ad647)

Conflicts:
	models/user/user_test.go
  trivial context conflict
This commit is contained in:
Lunny Xiao 2024-11-20 20:55:32 -08:00 committed by Earl Warren
parent 73d9e14e80
commit bf520f5184
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 27 additions and 6 deletions

View file

@ -332,6 +332,7 @@
repo_admin_change_team_access: false repo_admin_change_team_access: false
theme: "" theme: ""
keep_activity_private: false keep_activity_private: false
created_unix: 1730468968
- -
id: 10 id: 10

View file

@ -50,19 +50,19 @@ const (
UserTypeIndividual UserType = iota // Historic reason to make it starts at 0. UserTypeIndividual UserType = iota // Historic reason to make it starts at 0.
// UserTypeOrganization defines an organization // UserTypeOrganization defines an organization
UserTypeOrganization UserTypeOrganization // 1
// UserTypeUserReserved reserves a (non-existing) user, i.e. to prevent a spam user from re-registering after being deleted, or to reserve the name until the user is actually created later on // UserTypeUserReserved reserves a (non-existing) user, i.e. to prevent a spam user from re-registering after being deleted, or to reserve the name until the user is actually created later on
UserTypeUserReserved UserTypeUserReserved // 2
// UserTypeOrganizationReserved reserves a (non-existing) organization, to be used in combination with UserTypeUserReserved // UserTypeOrganizationReserved reserves a (non-existing) organization, to be used in combination with UserTypeUserReserved
UserTypeOrganizationReserved UserTypeOrganizationReserved // 3
// UserTypeBot defines a bot user // UserTypeBot defines a bot user
UserTypeBot UserTypeBot // 4
// UserTypeRemoteUser defines a remote user for federated users // UserTypeRemoteUser defines a remote user for federated users
UserTypeRemoteUser UserTypeRemoteUser // 5
) )
const ( const (
@ -917,7 +917,13 @@ func UpdateUserCols(ctx context.Context, u *User, cols ...string) error {
// GetInactiveUsers gets all inactive users // GetInactiveUsers gets all inactive users
func GetInactiveUsers(ctx context.Context, olderThan time.Duration) ([]*User, error) { func GetInactiveUsers(ctx context.Context, olderThan time.Duration) ([]*User, error) {
var cond builder.Cond = builder.Eq{"is_active": false} cond := builder.And(
builder.Eq{"is_active": false},
builder.Or( // only plain user
builder.Eq{"`type`": UserTypeIndividual},
builder.Eq{"`type`": UserTypeUserReserved},
),
)
if olderThan > 0 { if olderThan > 0 {
cond = cond.And(builder.Lt{"created_unix": time.Now().Add(-olderThan).Unix()}) cond = cond.And(builder.Lt{"created_unix": time.Now().Add(-olderThan).Unix()})

View file

@ -765,3 +765,17 @@ func TestVerifyUserAuthorizationToken(t *testing.T) {
assert.Nil(t, authToken) assert.Nil(t, authToken)
}) })
} }
func TestGetInactiveUsers(t *testing.T) {
require.NoError(t, unittest.PrepareTestDatabase())
// all inactive users
// user1's createdunix is 1730468968
users, err := user_model.GetInactiveUsers(db.DefaultContext, 0)
require.NoError(t, err)
assert.Len(t, users, 1)
interval := time.Now().Unix() - 1730468968 + 3600*24
users, err = user_model.GetInactiveUsers(db.DefaultContext, time.Duration(interval*int64(time.Second)))
require.NoError(t, err)
require.Empty(t, users)
}