From ac6ed3d939fe9dad81aadbd04541e905c625ca82 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 15 Aug 2022 12:35:05 +0200
Subject: [chore] Update bun / sqlite versions; update gtsmodels (#754)

* upstep bun and sqlite versions

* allow specific columns to be updated in the db

* only update necessary columns for user

* bit tidier

* only update necessary fields of media_attachment

* only update relevant instance fields

* update tests

* update only specific account columns

* use bool pointers on gtsmodels
includes attachment, status, account, user

* update columns more selectively

* test all default fields on new account insert

* updating remaining bools on gtsmodels

* initialize pointer fields when extracting AP emoji

* copy bools properly

* add copyBoolPtr convenience function + test it

* initialize false bool ptrs a bit more neatly
---
 internal/db/bundb/admin.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'internal/db/bundb/admin.go')

diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go
index 1bda82d56..f66ed0294 100644
--- a/internal/db/bundb/admin.go
+++ b/internal/db/bundb/admin.go
@@ -142,6 +142,8 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string,
 		return nil, err
 	}
 
+	// if we don't require moderator approval, just pre-approve the user
+	approved := !requireApproval
 	u := &gtsmodel.User{
 		ID:                     newUserID,
 		AccountID:              acct.ID,
@@ -151,7 +153,7 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string,
 		Locale:                 locale,
 		UnconfirmedEmail:       email,
 		CreatedByApplicationID: appID,
-		Approved:               !requireApproval, // if we don't require moderator approval, just pre-approve the user
+		Approved:               &approved,
 	}
 
 	if emailVerified {
@@ -161,8 +163,10 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string,
 	}
 
 	if admin {
-		u.Admin = true
-		u.Moderator = true
+		admin := true
+		moderator := true
+		u.Admin = &admin
+		u.Moderator = &moderator
 	}
 
 	if _, err = a.conn.
-- 
cgit v1.2.3