From 281f712477cbb5ba51c065ba7889caa78242117b Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 2 Dec 2022 17:41:10 +0100 Subject: [bugfix] Fix `admin account confirm` on pre-confirmed account setting email address to empty string (#1203) --- cmd/gotosocial/action/admin/account/account.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cmd') 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 } -- cgit v1.3