Merge pull request #186 from superseriousbusiness/struct_validation

Struct validation

2 files changed, 4 insertions, 5 deletions

diff --git a/internal/text/common.go b/internal/text/common.go
index a8d585a09..a3ec15e46 100644
--- a/internal/text/common.go
+++ b/internal/text/common.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/internal/util"
+	"github.com/superseriousbusiness/gotosocial/internal/regexes"
 )
 
 // preformat contains some common logic for making a string ready for formatting, which should be used for all user-input text.
@@ -61,7 +61,7 @@ func postformat(in string) string {
 }
 
 func (f *formatter) ReplaceTags(ctx context.Context, in string, tags []*gtsmodel.Tag) string {
-	return util.HashtagFinderRegex.ReplaceAllStringFunc(in, func(match string) string {
+	return regexes.HashtagFinder.ReplaceAllStringFunc(in, func(match string) string {
 		// we have a match
 		matchTrimmed := strings.TrimSpace(match)
 		tagAsEntered := strings.Split(matchTrimmed, "#")[1]
diff --git a/internal/text/formatter_test.go b/internal/text/formatter_test.go
index 803088794..228da4ec7 100644
--- a/internal/text/formatter_test.go
+++ b/internal/text/formatter_test.go
@@ -24,7 +24,6 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 	"github.com/superseriousbusiness/gotosocial/internal/text"
 )
 
@@ -37,8 +36,8 @@ type TextStandardTestSuite struct {
 	log    *logrus.Logger
 
 	// standard suite models
-	testTokens       map[string]*oauth.Token
-	testClients      map[string]*oauth.Client
+	testTokens       map[string]*gtsmodel.Token
+	testClients      map[string]*gtsmodel.Client
 	testApplications map[string]*gtsmodel.Application
 	testUsers        map[string]*gtsmodel.User
 	testAccounts     map[string]*gtsmodel.Account