[chore] Use generic pointer function (#2080)

This replaces the different $TypePtr functions with a generic
implementation.

6 files changed, 20 insertions, 16 deletions

diff --git a/internal/api/auth/authorize_test.go b/internal/api/auth/authorize_test.go
index ff65d041b..54df4c5e5 100644
--- a/internal/api/auth/authorize_test.go
+++ b/internal/api/auth/authorize_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/gotosocial/internal/api/auth"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/testrig"
+	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
 
 type AuthAuthorizeTestSuite struct {
@@ -51,8 +51,8 @@ func (suite *AuthAuthorizeTestSuite) TestAccountAuthorizeHandler() {
 			mutateUserAccount: func(user *gtsmodel.User, account *gtsmodel.Account) []string {
 				user.ConfirmedAt = time.Now()
 				user.Email = user.UnconfirmedEmail
-				user.Approved = testrig.TrueBool()
-				user.Disabled = testrig.TrueBool()
+				user.Approved = util.Ptr(true)
+				user.Disabled = util.Ptr(true)
 				return []string{"confirmed_at", "email", "approved", "disabled"}
 			},
 			expectedStatusCode:     http.StatusSeeOther,
@@ -63,8 +63,8 @@ func (suite *AuthAuthorizeTestSuite) TestAccountAuthorizeHandler() {
 			mutateUserAccount: func(user *gtsmodel.User, account *gtsmodel.Account) []string {
 				user.ConfirmedAt = time.Now()
 				user.Email = user.UnconfirmedEmail
-				user.Approved = testrig.TrueBool()
-				user.Disabled = testrig.FalseBool()
+				user.Approved = util.Ptr(true)
+				user.Disabled = util.Ptr(false)
 				account.SuspendedAt = time.Now()
 				return []string{"confirmed_at", "email", "approved", "disabled"}
 			},
diff --git a/internal/api/client/admin/reportresolve_test.go b/internal/api/client/admin/reportresolve_test.go
index 754dbb443..087080a70 100644
--- a/internal/api/client/admin/reportresolve_test.go
+++ b/internal/api/client/admin/reportresolve_test.go
@@ -138,7 +138,7 @@ func (suite *ReportResolveTestSuite) TestReportResolve2() {
 	testToken := suite.testTokens["admin_account"]
 	testUser := suite.testUsers["admin_account"]
 	testReportID := suite.testReports["local_account_2_report_remote_account_1"].ID
-	var actionTakenComment *string = testrig.StringPtr("no action was taken, this is a frivolous report you boob")
+	var actionTakenComment *string = util.Ptr("no action was taken, this is a frivolous report you boob")
 
 	report, err := suite.resolveReport(testAccount, testToken, testUser, testReportID, http.StatusOK, "", actionTakenComment)
 	suite.NoError(err)
diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go
index 4f29aa872..943e9711a 100644
--- a/internal/api/client/admin/reportsget_test.go
+++ b/internal/api/client/admin/reportsget_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/util"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -963,7 +964,7 @@ func (suite *ReportsGetTestSuite) TestReportsGetResolvedTargetAccount() {
 	testAccount := suite.testAccounts["admin_account"]
 	testToken := suite.testTokens["admin_account"]
 	testUser := suite.testUsers["admin_account"]
-	resolved := testrig.FalseBool()
+	resolved := util.Ptr(false)
 	targetAccount := suite.testAccounts["local_account_2"]
 
 	reports, link, err := suite.getReports(testAccount, testToken, testUser, http.StatusOK, "", resolved, "", targetAccount.ID, "", "", "", 20)
diff --git a/internal/api/client/instance/instancepeersget_test.go b/internal/api/client/instance/instancepeersget_test.go
index 70f625069..a2c81cc4e 100644
--- a/internal/api/client/instance/instancepeersget_test.go
+++ b/internal/api/client/instance/instancepeersget_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/api/client/instance"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+	"github.com/superseriousbusiness/gotosocial/internal/util"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -231,7 +232,7 @@ func (suite *InstancePeersGetTestSuite) TestInstancePeersGetAllWithObfuscated()
 		Domain:             "omg.just.the.worst.org.ever",
 		CreatedByAccountID: "01F8MH17FWEB39HZJ76B6VXSKF",
 		PublicComment:      "just absolutely the worst, wowza",
-		Obfuscate:          testrig.TrueBool(),
+		Obfuscate:          util.Ptr(true),
 	})
 	suite.NoError(err)
 
diff --git a/internal/api/client/reports/reportsget_test.go b/internal/api/client/reports/reportsget_test.go
index 709077f0d..d220dc94d 100644
--- a/internal/api/client/reports/reportsget_test.go
+++ b/internal/api/client/reports/reportsget_test.go
@@ -32,6 +32,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/util"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -197,7 +198,7 @@ func (suite *ReportsGetTestSuite) TestGetReports4() {
 	testAccount := suite.testAccounts["local_account_2"]
 	testToken := suite.testTokens["local_account_2"]
 	testUser := suite.testUsers["local_account_2"]
-	resolved := testrig.FalseBool()
+	resolved := util.Ptr(false)
 
 	reports, link, err := suite.getReports(testAccount, testToken, testUser, http.StatusOK, resolved, "", "", "", "", 20)
 	suite.NoError(err)
@@ -252,7 +253,7 @@ func (suite *ReportsGetTestSuite) TestGetReports5() {
 	testAccount := suite.testAccounts["local_account_1"]
 	testToken := suite.testTokens["local_account_1"]
 	testUser := suite.testUsers["local_account_1"]
-	resolved := testrig.TrueBool()
+	resolved := util.Ptr(true)
 
 	reports, link, err := suite.getReports(testAccount, testToken, testUser, http.StatusOK, resolved, "", "", "", "", 20)
 	suite.NoError(err)
@@ -323,7 +324,7 @@ func (suite *ReportsGetTestSuite) TestGetReports7() {
 	testAccount := suite.testAccounts["local_account_2"]
 	testToken := suite.testTokens["local_account_2"]
 	testUser := suite.testUsers["local_account_2"]
-	resolved := testrig.FalseBool()
+	resolved := util.Ptr(false)
 
 	reports, link, err := suite.getReports(testAccount, testToken, testUser, http.StatusOK, resolved, "01F8MH5ZK5VRH73AKHQM6Y9VNX", "", "", "", 20)
 	suite.NoError(err)
diff --git a/internal/api/client/statuses/statuspin_test.go b/internal/api/client/statuses/statuspin_test.go
index c7ed6e95d..034860031 100644
--- a/internal/api/client/statuses/statuspin_test.go
+++ b/internal/api/client/statuses/statuspin_test.go
@@ -36,6 +36,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/id"
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/internal/util"
 	"github.com/superseriousbusiness/gotosocial/testrig"
 )
 
@@ -165,14 +166,14 @@ func (suite *StatusPinTestSuite) TestPinStatusTooManyPins() {
 			PinnedAt:            time.Now(),
 			URL:                 "stub " + strconv.Itoa(i),
 			URI:                 "stub " + strconv.Itoa(i),
-			Local:               testrig.TrueBool(),
+			Local:               util.Ptr(true),
 			AccountID:           testAccount.ID,
 			AccountURI:          testAccount.URI,
 			Visibility:          gtsmodel.VisibilityPublic,
-			Federated:           testrig.TrueBool(),
-			Boostable:           testrig.TrueBool(),
-			Replyable:           testrig.TrueBool(),
-			Likeable:            testrig.TrueBool(),
+			Federated:           util.Ptr(true),
+			Boostable:           util.Ptr(true),
+			Replyable:           util.Ptr(true),
+			Likeable:            util.Ptr(true),
 			ActivityStreamsType: ap.ObjectNote,
 		}
 		if err := suite.db.PutStatus(ctx, status); err != nil {