summaryrefslogtreecommitdiff
path: root/internal/text
diff options
context:
space:
mode:
Diffstat (limited to 'internal/text')
-rw-r--r--internal/text/formatter.go9
-rw-r--r--internal/text/formatter_test.go10
2 files changed, 8 insertions, 11 deletions
diff --git a/internal/text/formatter.go b/internal/text/formatter.go
index b0988e9f9..f7c908a7d 100644
--- a/internal/text/formatter.go
+++ b/internal/text/formatter.go
@@ -21,7 +21,6 @@ package text
import (
"context"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
@@ -42,14 +41,12 @@ type Formatter interface {
}
type formatter struct {
- cfg *config.Config
- db db.DB
+ db db.DB
}
// NewFormatter returns a new Formatter interface for parsing statuses and other text input into nice html.
-func NewFormatter(cfg *config.Config, db db.DB) Formatter {
+func NewFormatter(db db.DB) Formatter {
return &formatter{
- cfg: cfg,
- db: db,
+ db: db,
}
}
diff --git a/internal/text/formatter_test.go b/internal/text/formatter_test.go
index 8b4d176e2..096d32789 100644
--- a/internal/text/formatter_test.go
+++ b/internal/text/formatter_test.go
@@ -20,7 +20,6 @@ package text_test
import (
"github.com/stretchr/testify/suite"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/text"
@@ -30,8 +29,7 @@ import (
type TextStandardTestSuite struct {
// standard suite interfaces
suite.Suite
- config *config.Config
- db db.DB
+ db db.DB
// standard suite models
testTokens map[string]*gtsmodel.Token
@@ -61,9 +59,11 @@ func (suite *TextStandardTestSuite) SetupSuite() {
}
func (suite *TextStandardTestSuite) SetupTest() {
- suite.config = testrig.NewTestConfig()
+ testrig.InitTestLog()
+ testrig.InitTestConfig()
+
suite.db = testrig.NewTestDB()
- suite.formatter = text.NewFormatter(suite.config, suite.db)
+ suite.formatter = text.NewFormatter(suite.db)
testrig.StandardDBSetup(suite.db, nil)
}