diff options
Diffstat (limited to 'internal/api/client/fileserver')
| -rw-r--r-- | internal/api/client/fileserver/fileserver.go | 15 | ||||
| -rw-r--r-- | internal/api/client/fileserver/servefile_test.go | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/internal/api/client/fileserver/fileserver.go b/internal/api/client/fileserver/fileserver.go index e60105686..092a15256 100644 --- a/internal/api/client/fileserver/fileserver.go +++ b/internal/api/client/fileserver/fileserver.go @@ -22,6 +22,7 @@ import ( "fmt" "net/http" + "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/processing" @@ -42,22 +43,20 @@ const ( // FileServer implements the RESTAPIModule interface. // The goal here is to serve requested media files if the gotosocial server is configured to use local storage. type FileServer struct { - config *config.Config - processor processing.Processor - storageBase string + processor processing.Processor + storageServeBasePath string } // New returns a new fileServer module -func New(config *config.Config, processor processing.Processor) api.ClientModule { +func New(processor processing.Processor) api.ClientModule { return &FileServer{ - config: config, - processor: processor, - storageBase: config.StorageConfig.ServeBasePath, + processor: processor, + storageServeBasePath: viper.GetString(config.Keys.StorageServeBasePath), } } // Route satisfies the RESTAPIModule interface func (m *FileServer) Route(s router.Router) error { - s.AttachHandler(http.MethodGet, fmt.Sprintf("%s/:%s/:%s/:%s/:%s", m.storageBase, AccountIDKey, MediaTypeKey, MediaSizeKey, FileNameKey), m.ServeFile) + s.AttachHandler(http.MethodGet, fmt.Sprintf("%s/:%s/:%s/:%s/:%s", m.storageServeBasePath, AccountIDKey, MediaTypeKey, MediaSizeKey, FileNameKey), m.ServeFile) return nil } diff --git a/internal/api/client/fileserver/servefile_test.go b/internal/api/client/fileserver/servefile_test.go index 692122a7b..b93f97606 100644 --- a/internal/api/client/fileserver/servefile_test.go +++ b/internal/api/client/fileserver/servefile_test.go @@ -32,7 +32,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/api/client/fileserver" - "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" @@ -47,7 +46,6 @@ import ( type ServeFileTestSuite struct { // standard suite interfaces suite.Suite - config *config.Config db db.DB storage *kv.KVStore federator federation.Federator @@ -75,9 +73,9 @@ type ServeFileTestSuite struct { func (suite *ServeFileTestSuite) SetupSuite() { // setup standard items - suite.config = testrig.NewTestConfig() - suite.db = testrig.NewTestDB() + testrig.InitTestConfig() testrig.InitTestLog() + suite.db = testrig.NewTestDB() suite.storage = testrig.NewTestStorage() suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db), suite.storage) suite.emailSender = testrig.NewEmailSender("../../../../web/template/", nil) @@ -88,7 +86,7 @@ func (suite *ServeFileTestSuite) SetupSuite() { suite.oauthServer = testrig.NewTestOauthServer(suite.db) // setup module being tested - suite.fileServer = fileserver.New(suite.config, suite.processor).(*fileserver.FileServer) + suite.fileServer = fileserver.New(suite.processor).(*fileserver.FileServer) } func (suite *ServeFileTestSuite) TearDownSuite() { |