4 files changed, 17 insertions, 13 deletions
diff --git a/internal/processing/account/createfollow.go b/internal/processing/account/createfollow.go
index 49430b9fb..7e7692135 100644
--- a/internal/processing/account/createfollow.go
+++ b/internal/processing/account/createfollow.go
@@ -76,19 +76,21 @@ func (p *processor) FollowCreate(ctx context.Context, requestingAccount *gtsmode
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
+	showReblogs := true
+	notify := false
 	fr := &gtsmodel.FollowRequest{
 		ID:              newFollowID,
 		AccountID:       requestingAccount.ID,
 		TargetAccountID: form.ID,
-		ShowReblogs:     true,
+		ShowReblogs:     &showReblogs,
 		URI:             uris.GenerateURIForFollow(requestingAccount.Username, newFollowID),
-		Notify:          false,
+		Notify:          &notify,
 	}
 	if form.Reblogs != nil {
-		fr.ShowReblogs = *form.Reblogs
+		fr.ShowReblogs = form.Reblogs
 	}
 	if form.Notify != nil {
-		fr.Notify = *form.Notify
+		fr.Notify = form.Notify
 	}
 
 	// whack it in the database
@@ -97,7 +99,7 @@ func (p *processor) FollowCreate(ctx context.Context, requestingAccount *gtsmode
 	}
 
 	// if it's a local account that's not locked we can just straight up accept the follow request
-	if !targetAcct.Locked && targetAcct.Domain == "" {
+	if !*targetAcct.Locked && targetAcct.Domain == "" {
 		if _, err := p.db.AcceptFollowRequest(ctx, requestingAccount.ID, form.ID); err != nil {
 			return nil, gtserror.NewErrorInternalError(fmt.Errorf("accountfollowcreate: error accepting folow request for local unlocked account: %s", err))
 		}
diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go
index 7b382f17c..f71f08954 100644
--- a/internal/processing/account/delete.go
+++ b/internal/processing/account/delete.go
@@ -285,8 +285,10 @@ selectStatusesLoop:
 	account.HeaderRemoteURL = ""
 	account.Reason = ""
 	account.Fields = []gtsmodel.Field{}
-	account.HideCollections = true
-	account.Discoverable = false
+	hideCollections := true
+	account.HideCollections = &hideCollections
+	discoverable := false
+	account.Discoverable = &discoverable
 
 	account.SuspendedAt = time.Now()
 	account.SuspensionOrigin = origin
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go
index 804e7ba7e..3b844a160 100644
--- a/internal/processing/account/update.go
+++ b/internal/processing/account/update.go
@@ -39,11 +39,11 @@ import (
 
 func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form *apimodel.UpdateCredentialsRequest) (*apimodel.Account, gtserror.WithCode) {
 	if form.Discoverable != nil {
-		account.Discoverable = *form.Discoverable
+		account.Discoverable = form.Discoverable
 	}
 
 	if form.Bot != nil {
-		account.Bot = *form.Bot
+		account.Bot = form.Bot
 	}
 
 	if form.DisplayName != nil {
@@ -92,7 +92,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
 	}
 
 	if form.Locked != nil {
-		account.Locked = *form.Locked
+		account.Locked = form.Locked
 	}
 
 	if form.Source != nil {
@@ -104,7 +104,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
 		}
 
 		if form.Source.Sensitive != nil {
-			account.Sensitive = *form.Source.Sensitive
+			account.Sensitive = form.Source.Sensitive
 		}
 
 		if form.Source.Privacy != nil {
diff --git a/internal/processing/account/update_test.go b/internal/processing/account/update_test.go
index 7e4ca818e..0483154c6 100644
--- a/internal/processing/account/update_test.go
+++ b/internal/processing/account/update_test.go
@@ -65,7 +65,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateSimple() {
 	// fields should be updated in the database as well
 	dbAccount, err := suite.db.GetAccountByID(context.Background(), testAccount.ID)
 	suite.NoError(err)
-	suite.True(dbAccount.Locked)
+	suite.True(*dbAccount.Locked)
 	suite.Equal(displayName, dbAccount.DisplayName)
 	suite.Equal(`<p><a href="http://localhost:8080/tags/hello" class="mention hashtag" rel="tag nofollow noreferrer noopener" target="_blank">#<span>hello</span></a> here i am!</p>`, dbAccount.Note)
 }
@@ -107,7 +107,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateWithMention() {
 	// fields should be updated in the database as well
 	dbAccount, err := suite.db.GetAccountByID(context.Background(), testAccount.ID)
 	suite.NoError(err)
-	suite.True(dbAccount.Locked)
+	suite.True(*dbAccount.Locked)
 	suite.Equal(displayName, dbAccount.DisplayName)
 	suite.Equal(noteExpected, dbAccount.Note)
 }