summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-12-02 17:41:10 +0100
committerLibravatar GitHub <noreply@github.com>2022-12-02 17:41:10 +0100
commit281f712477cbb5ba51c065ba7889caa78242117b (patch)
tree58a54fb65a7da8934932519dd2df6d9b0f65bc30 /cmd
parent[bugfix] Add missing continues in emoji get funcs (#1200) (diff)
downloadgotosocial-281f712477cbb5ba51c065ba7889caa78242117b.tar.xz
[bugfix] Fix `admin account confirm` on pre-confirmed account setting email address to empty string (#1203)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gotosocial/action/admin/account/account.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go
index 801f8fa62..6c059d1fe 100644
--- 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
}