summaryrefslogtreecommitdiff
path: root/internal/api/s2s/user
diff options
context:
space:
mode:
Diffstat (limited to 'internal/api/s2s/user')
-rw-r--r--internal/api/s2s/user/inboxpost_test.go8
-rw-r--r--internal/api/s2s/user/outboxget_test.go6
-rw-r--r--internal/api/s2s/user/repliesget_test.go6
-rw-r--r--internal/api/s2s/user/user.go5
-rw-r--r--internal/api/s2s/user/user_test.go11
-rw-r--r--internal/api/s2s/user/userget_test.go2
6 files changed, 17 insertions, 21 deletions
diff --git a/internal/api/s2s/user/inboxpost_test.go b/internal/api/s2s/user/inboxpost_test.go
index 4d1c05757..716dcfc25 100644
--- a/internal/api/s2s/user/inboxpost_test.go
+++ b/internal/api/s2s/user/inboxpost_test.go
@@ -87,7 +87,7 @@ func (suite *InboxPostTestSuite) TestPostBlock() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -187,7 +187,7 @@ func (suite *InboxPostTestSuite) TestPostUnblock() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -277,7 +277,7 @@ func (suite *InboxPostTestSuite) TestPostUpdate() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -398,7 +398,7 @@ func (suite *InboxPostTestSuite) TestPostDelete() {
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
err = processor.Start(context.Background())
suite.NoError(err)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
diff --git a/internal/api/s2s/user/outboxget_test.go b/internal/api/s2s/user/outboxget_test.go
index 251051cbd..4cd556bbe 100644
--- a/internal/api/s2s/user/outboxget_test.go
+++ b/internal/api/s2s/user/outboxget_test.go
@@ -48,7 +48,7 @@ func (suite *OutboxGetTestSuite) TestGetOutbox() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -102,7 +102,7 @@ func (suite *OutboxGetTestSuite) TestGetOutboxFirstPage() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -156,7 +156,7 @@ func (suite *OutboxGetTestSuite) TestGetOutboxNextPage() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
diff --git a/internal/api/s2s/user/repliesget_test.go b/internal/api/s2s/user/repliesget_test.go
index cd1094b53..a4229bb21 100644
--- a/internal/api/s2s/user/repliesget_test.go
+++ b/internal/api/s2s/user/repliesget_test.go
@@ -51,7 +51,7 @@ func (suite *RepliesGetTestSuite) TestGetReplies() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -111,7 +111,7 @@ func (suite *RepliesGetTestSuite) TestGetRepliesNext() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
@@ -174,7 +174,7 @@ func (suite *RepliesGetTestSuite) TestGetRepliesLast() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
diff --git a/internal/api/s2s/user/user.go b/internal/api/s2s/user/user.go
index 56b940f1d..891f2c1b1 100644
--- a/internal/api/s2s/user/user.go
+++ b/internal/api/s2s/user/user.go
@@ -22,7 +22,6 @@ import (
"net/http"
"github.com/superseriousbusiness/gotosocial/internal/api"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/processing"
"github.com/superseriousbusiness/gotosocial/internal/router"
"github.com/superseriousbusiness/gotosocial/internal/util"
@@ -66,14 +65,12 @@ const (
// Module implements the FederationAPIModule interface
type Module struct {
- config *config.Config
processor processing.Processor
}
// New returns a new auth module
-func New(config *config.Config, processor processing.Processor) api.FederationModule {
+func New(processor processing.Processor) api.FederationModule {
return &Module{
- config: config,
processor: processor,
}
}
diff --git a/internal/api/s2s/user/user_test.go b/internal/api/s2s/user/user_test.go
index da305488f..ed6a83312 100644
--- a/internal/api/s2s/user/user_test.go
+++ b/internal/api/s2s/user/user_test.go
@@ -23,7 +23,6 @@ import (
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user"
"github.com/superseriousbusiness/gotosocial/internal/api/security"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/email"
"github.com/superseriousbusiness/gotosocial/internal/federation"
@@ -37,7 +36,6 @@ import (
type UserStandardTestSuite struct {
// standard suite interfaces
suite.Suite
- config *config.Config
db db.DB
tc typeutils.TypeConverter
federator federation.Federator
@@ -73,17 +71,18 @@ func (suite *UserStandardTestSuite) SetupSuite() {
}
func (suite *UserStandardTestSuite) SetupTest() {
- suite.config = testrig.NewTestConfig()
+ testrig.InitTestLog()
+ testrig.InitTestConfig()
+
suite.db = testrig.NewTestDB()
suite.tc = testrig.NewTestTypeConverter(suite.db)
suite.storage = testrig.NewTestStorage()
- testrig.InitTestLog()
suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db), suite.storage)
suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil)
suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator, suite.emailSender)
- suite.userModule = user.New(suite.config, suite.processor).(*user.Module)
+ suite.userModule = user.New(suite.processor).(*user.Module)
suite.oauthServer = testrig.NewTestOauthServer(suite.db)
- suite.securityModule = security.New(suite.config, suite.db, suite.oauthServer).(*security.Module)
+ suite.securityModule = security.New(suite.db, suite.oauthServer).(*security.Module)
testrig.StandardDBSetup(suite.db, suite.testAccounts)
testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media")
}
diff --git a/internal/api/s2s/user/userget_test.go b/internal/api/s2s/user/userget_test.go
index 303295cfe..8ad4a8151 100644
--- a/internal/api/s2s/user/userget_test.go
+++ b/internal/api/s2s/user/userget_test.go
@@ -49,7 +49,7 @@ func (suite *UserGetTestSuite) TestGetUser() {
federator := testrig.NewTestFederator(suite.db, tc, suite.storage)
emailSender := testrig.NewEmailSender("../../../../web/template/", nil)
processor := testrig.NewTestProcessor(suite.db, suite.storage, federator, emailSender)
- userModule := user.New(suite.config, processor).(*user.Module)
+ userModule := user.New(processor).(*user.Module)
// setup request
recorder := httptest.NewRecorder()
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-12 23:56:12 +0000