[bugfix] Fix admin account confirm on pre-confirmed account setting…

… email address to empty string (#1203)
superseriousbusiness · Dec 2, 2022 · 281f712 · 281f712
1 parent 34716d7
commit 281f712
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go
@@ -111,13 +111,12 @@ var Confirm action.GTSAction = func(ctx context.Context) error {
 		return err
 	}
 
-	updatingColumns := []string{"approved", "email", "confirmed_at", "updated_at"}
+	updatingColumns := []string{"approved", "email", "confirmed_at"}
 	approved := true
 	u.Approved = &approved
 	u.Email = u.UnconfirmedEmail
 	u.ConfirmedAt = time.Now()
-	u.UpdatedAt = time.Now()
-	if err := dbConn.UpdateByID(ctx, u, u.ID, updatingColumns...); err != nil {
+	if err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
 		return err
 	}
 

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