diff options
Diffstat (limited to 'internal/api/client/media')
| -rw-r--r-- | internal/api/client/media/mediacreate.go | 10 | ||||
| -rw-r--r-- | internal/api/client/media/mediacreate_test.go | 3 | ||||
| -rw-r--r-- | internal/api/client/media/mediaupdate.go | 6 | ||||
| -rw-r--r-- | internal/api/client/media/mediaupdate_test.go | 3 |
4 files changed, 8 insertions, 14 deletions
diff --git a/internal/api/client/media/mediacreate.go b/internal/api/client/media/mediacreate.go index 5946ed398..ed6a12d37 100644 --- a/internal/api/client/media/mediacreate.go +++ b/internal/api/client/media/mediacreate.go @@ -24,7 +24,6 @@ import ( "net/http" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/internal/api" @@ -133,11 +132,10 @@ func validateCreateMedia(form *model.AttachmentRequest) error { return errors.New("no attachment given") } - keys := config.Keys - maxVideoSize := viper.GetInt(keys.MediaVideoMaxSize) - maxImageSize := viper.GetInt(keys.MediaImageMaxSize) - minDescriptionChars := viper.GetInt(keys.MediaDescriptionMinChars) - maxDescriptionChars := viper.GetInt(keys.MediaDescriptionMaxChars) + maxVideoSize := config.GetMediaVideoMaxSize() + maxImageSize := config.GetMediaImageMaxSize() + minDescriptionChars := config.GetMediaDescriptionMinChars() + maxDescriptionChars := config.GetMediaDescriptionMaxChars() // a very superficial check to see if no size limits are exceeded // we still don't actually know which media types we're dealing with but the other handlers will go into more detail there diff --git a/internal/api/client/media/mediacreate_test.go b/internal/api/client/media/mediacreate_test.go index e16b9f5eb..f39e756f7 100644 --- a/internal/api/client/media/mediacreate_test.go +++ b/internal/api/client/media/mediacreate_test.go @@ -33,7 +33,6 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/stretchr/testify/suite" mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -261,7 +260,7 @@ func (suite *MediaCreateTestSuite) TestMediaCreateLongDescription() { func (suite *MediaCreateTestSuite) TestMediaCreateTooShortDescription() { // set the min description length - viper.Set(config.Keys.MediaDescriptionMinChars, 500) + config.SetMediaDescriptionMinChars(500) // set up the context for the request t := suite.testTokens["local_account_1"] diff --git a/internal/api/client/media/mediaupdate.go b/internal/api/client/media/mediaupdate.go index ffe3b5e55..21b8c9c8e 100644 --- a/internal/api/client/media/mediaupdate.go +++ b/internal/api/client/media/mediaupdate.go @@ -24,7 +24,6 @@ import ( "net/http" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/gin-gonic/gin" "github.com/superseriousbusiness/gotosocial/internal/api" @@ -141,9 +140,8 @@ func (m *Module) MediaPUTHandler(c *gin.Context) { } func validateUpdateMedia(form *model.AttachmentUpdateRequest) error { - keys := config.Keys - minDescriptionChars := viper.GetInt(keys.MediaDescriptionMinChars) - maxDescriptionChars := viper.GetInt(keys.MediaDescriptionMaxChars) + minDescriptionChars := config.GetMediaDescriptionMinChars() + maxDescriptionChars := config.GetMediaDescriptionMaxChars() if form.Description != nil { if len(*form.Description) < minDescriptionChars || len(*form.Description) > maxDescriptionChars { diff --git a/internal/api/client/media/mediaupdate_test.go b/internal/api/client/media/mediaupdate_test.go index a87718438..fbf794e1d 100644 --- a/internal/api/client/media/mediaupdate_test.go +++ b/internal/api/client/media/mediaupdate_test.go @@ -31,7 +31,6 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/stretchr/testify/suite" mediamodule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -188,7 +187,7 @@ func (suite *MediaUpdateTestSuite) TestUpdateImage() { func (suite *MediaUpdateTestSuite) TestUpdateImageShortDescription() { // set the min description length - viper.Set(config.Keys.MediaDescriptionMinChars, 50) + config.SetMediaDescriptionMinChars(50) toUpdate := suite.testAttachments["local_account_1_unattached_1"] |