summaryrefslogtreecommitdiff
path: root/internal/api/client/instance/instancepatch.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-02-04 15:53:11 +0100
committerLibravatar GitHub <noreply@github.com>2023-02-04 15:53:11 +0100
commit80c26d61f75ca739e6071cc25b594033face3aa1 (patch)
treef272060d7bb0aea61a284b8d22e8dea3c84d05ca /internal/api/client/instance/instancepatch.go
parent[bugfix] Fix password change keys (#1416) (diff)
downloadgotosocial-80c26d61f75ca739e6071cc25b594033face3aa1.tar.xz
[bugfix] Allow instance thumbnail description to be set separately from image (#1417)
Diffstat (limited to 'internal/api/client/instance/instancepatch.go')
-rw-r--r--internal/api/client/instance/instancepatch.go14
1 files changed, 6 insertions, 8 deletions
diff --git a/internal/api/client/instance/instancepatch.go b/internal/api/client/instance/instancepatch.go
index a71d670b9..c30b5850e 100644
--- a/internal/api/client/instance/instancepatch.go
+++ b/internal/api/client/instance/instancepatch.go
@@ -178,19 +178,17 @@ func validateInstanceUpdate(form *apimodel.InstanceSettingsUpdateRequest) error
return errors.New("empty form submitted")
}
- maxImageSize := config.GetMediaImageMaxSize()
- maxDescriptionChars := config.GetMediaDescriptionMaxChars()
-
- // validate avatar if present
if form.Avatar != nil {
+ maxImageSize := config.GetMediaImageMaxSize()
if size := form.Avatar.Size; size > int64(maxImageSize) {
return fmt.Errorf("file size limit exceeded: limit is %d bytes but desired instance avatar was %d bytes", maxImageSize, size)
}
+ }
- if form.AvatarDescription != nil {
- if length := len([]rune(*form.AvatarDescription)); length > maxDescriptionChars {
- return fmt.Errorf("avatar description length must be less than %d characters (inclusive), but provided avatar description was %d chars", maxDescriptionChars, length)
- }
+ if form.AvatarDescription != nil {
+ maxDescriptionChars := config.GetMediaDescriptionMaxChars()
+ if length := len([]rune(*form.AvatarDescription)); length > maxDescriptionChars {
+ return fmt.Errorf("avatar description length must be less than %d characters (inclusive), but provided avatar description was %d chars", maxDescriptionChars, length)
}
}