summaryrefslogtreecommitdiff
path: root/internal/typeutils
diff options
context:
space:
mode:
Diffstat (limited to 'internal/typeutils')
-rw-r--r--internal/typeutils/internaltofrontend.go5
-rw-r--r--internal/typeutils/internaltofrontend_test.go4
2 files changed, 4 insertions, 5 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index 6da78ed83..bef44e32f 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -50,7 +50,6 @@ const (
instancePollsMinExpiration = 300 // seconds
instancePollsMaxExpiration = 2629746 // seconds
instanceAccountsMaxFeaturedTags = 10
- instanceAccountsMaxProfileFields = 6 // FIXME: https://codeberg.org/superseriousbusiness/gotosocial/issues/1876
instanceSourceURL = "https://codeberg.org/superseriousbusiness/gotosocial"
instanceMastodonVersion = "3.5.3"
)
@@ -1814,7 +1813,7 @@ func (c *Converter) InstanceToAPIV1Instance(ctx context.Context, i *gtsmodel.Ins
instance.Configuration.Polls.MaxExpiration = instancePollsMaxExpiration
instance.Configuration.Accounts.AllowCustomCSS = config.GetAccountsAllowCustomCSS()
instance.Configuration.Accounts.MaxFeaturedTags = instanceAccountsMaxFeaturedTags
- instance.Configuration.Accounts.MaxProfileFields = instanceAccountsMaxProfileFields
+ instance.Configuration.Accounts.MaxProfileFields = config.GetAccountsMaxProfileFields()
instance.Configuration.Emojis.EmojiSizeLimit = int(config.GetMediaEmojiLocalMaxSize()) // #nosec G115 -- Already validated.
instance.Configuration.OIDCEnabled = config.GetOIDCEnabled()
@@ -1992,7 +1991,7 @@ func (c *Converter) InstanceToAPIV2Instance(ctx context.Context, i *gtsmodel.Ins
instance.Configuration.Polls.MaxExpiration = instancePollsMaxExpiration
instance.Configuration.Accounts.AllowCustomCSS = config.GetAccountsAllowCustomCSS()
instance.Configuration.Accounts.MaxFeaturedTags = instanceAccountsMaxFeaturedTags
- instance.Configuration.Accounts.MaxProfileFields = instanceAccountsMaxProfileFields
+ instance.Configuration.Accounts.MaxProfileFields = config.GetAccountsMaxProfileFields()
instance.Configuration.Emojis.EmojiSizeLimit = int(config.GetMediaEmojiLocalMaxSize()) // #nosec G115 -- Already validated.
instance.Configuration.OIDCEnabled = config.GetOIDCEnabled()
diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go
index 6a5503e83..74250769b 100644
--- a/internal/typeutils/internaltofrontend_test.go
+++ b/internal/typeutils/internaltofrontend_test.go
@@ -2517,7 +2517,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV1ToFrontend() {
"accounts": {
"allow_custom_css": true,
"max_featured_tags": 10,
- "max_profile_fields": 6
+ "max_profile_fields": 8
},
"emojis": {
"emoji_size_limit": 51200
@@ -2621,7 +2621,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV2ToFrontend() {
"accounts": {
"allow_custom_css": true,
"max_featured_tags": 10,
- "max_profile_fields": 6
+ "max_profile_fields": 8
},
"statuses": {
"max_characters": 5000,