diff options
Diffstat (limited to 'internal/api/client/admin')
| -rw-r--r-- | internal/api/client/admin/admin_test.go | 5 | ||||
| -rw-r--r-- | internal/api/client/admin/mediacleanup.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/internal/api/client/admin/admin_test.go b/internal/api/client/admin/admin_test.go index 11e2f8354..251a8be9b 100644 --- a/internal/api/client/admin/admin_test.go +++ b/internal/api/client/admin/admin_test.go @@ -26,7 +26,6 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/gin-gonic/gin" - "github.com/spf13/viper" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" "github.com/superseriousbusiness/gotosocial/internal/concurrency" @@ -108,8 +107,8 @@ func (suite *AdminStandardTestSuite) newContext(recorder *httptest.ResponseRecor ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["admin_account"]) ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["admin_account"]) - protocol := viper.GetString(config.Keys.Protocol) - host := viper.GetString(config.Keys.Host) + protocol := config.GetProtocol() + host := config.GetHost() baseURI := fmt.Sprintf("%s://%s", protocol, host) requestURI := fmt.Sprintf("%s/%s", baseURI, requestPath) diff --git a/internal/api/client/admin/mediacleanup.go b/internal/api/client/admin/mediacleanup.go index 508840b23..02eec82f3 100644 --- a/internal/api/client/admin/mediacleanup.go +++ b/internal/api/client/admin/mediacleanup.go @@ -24,7 +24,6 @@ import ( "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/oauth" @@ -93,7 +92,7 @@ func (m *Module) MediaCleanupPOSTHandler(c *gin.Context) { var remoteCacheDays int if form.RemoteCacheDays == nil { - remoteCacheDays = viper.GetInt(config.Keys.MediaRemoteCacheDays) + remoteCacheDays = config.GetMediaRemoteCacheDays() } else { remoteCacheDays = *form.RemoteCacheDays } |