SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix] Fix `admin account confirm` on pre-confirmed account setting email address to empty string (#1203)

This commit is contained in:
tobi 2022-12-02 17:41:10 +01:00 committed by GitHub
parent 34716d7d7d
commit 281f712477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/gotosocial/action/admin/account/account.go
View File

@ -111,13 +111,12 @@ var Confirm action.GTSAction = func(ctx context.Context) error {
return err return err
} }
updatingColumns := []string{"approved", "email", "confirmed_at", "updated_at"} updatingColumns := []string{"approved", "email", "confirmed_at"}
approved := true approved := true
u.Approved = &approved u.Approved = &approved
u.Email = u.UnconfirmedEmail u.Email = u.UnconfirmedEmail
u.ConfirmedAt = time.Now() u.ConfirmedAt = time.Now()
u.UpdatedAt = time.Now() if err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
if err := dbConn.UpdateByID(ctx, u, u.ID, updatingColumns...); err != nil {
return err return err
} }

1
internal/db/bundb/admin.go
View File

@ -174,7 +174,6 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string,
if emailVerified { if emailVerified {
u.ConfirmedAt = time.Now() u.ConfirmedAt = time.Now()
u.Email = email u.Email = email
u.UnconfirmedEmail = ""
} }
if admin { if admin {