diff options
Diffstat (limited to 'internal/processing/account')
| -rw-r--r-- | internal/processing/account/create.go | 6 | ||||
| -rw-r--r-- | internal/processing/account/update.go | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/internal/processing/account/create.go b/internal/processing/account/create.go index 61c4f95ef..72626220b 100644 --- a/internal/processing/account/create.go +++ b/internal/processing/account/create.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -53,9 +52,8 @@ func (p *processor) Create(ctx context.Context, applicationToken oauth2.TokenInf return nil, fmt.Errorf("username %s in use", form.Username) } - keys := config.Keys - reasonRequired := viper.GetBool(keys.AccountsReasonRequired) - approvalRequired := viper.GetBool(keys.AccountsApprovalRequired) + reasonRequired := config.GetAccountsReasonRequired() + approvalRequired := config.GetAccountsApprovalRequired() // don't store a reason if we don't require one reason := form.Reason diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go index 5fae6e73b..42da40ffe 100644 --- a/internal/processing/account/update.go +++ b/internal/processing/account/update.go @@ -25,7 +25,6 @@ import ( "mime/multipart" "github.com/sirupsen/logrus" - "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" @@ -142,7 +141,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form // parsing and checking the image, and doing the necessary updates in the database for this to become // the account's new avatar image. func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) { - maxImageSize := viper.GetInt(config.Keys.MediaImageMaxSize) + maxImageSize := config.GetMediaImageMaxSize() if int(avatar.Size) > maxImageSize { return nil, fmt.Errorf("UpdateAvatar: avatar with size %d exceeded max image size of %d bytes", avatar.Size, maxImageSize) } @@ -169,7 +168,7 @@ func (p *processor) UpdateAvatar(ctx context.Context, avatar *multipart.FileHead // parsing and checking the image, and doing the necessary updates in the database for this to become // the account's new header image. func (p *processor) UpdateHeader(ctx context.Context, header *multipart.FileHeader, accountID string) (*gtsmodel.MediaAttachment, error) { - maxImageSize := viper.GetInt(config.Keys.MediaImageMaxSize) + maxImageSize := config.GetMediaImageMaxSize() if int(header.Size) > maxImageSize { return nil, fmt.Errorf("UpdateHeader: header with size %d exceeded max image size of %d bytes", header.Size, maxImageSize) } |