diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2025-04-07 13:52:24 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2025-04-07 12:52:24 +0100 |
| commit | 6f24205a26bde03e73055fd7af369352103c390f (patch) | |
| tree | a83d03a77267ac5452883868d4aca19b0c2114b6 | |
| parent | [chore]: Bump github.com/minio/minio-go/v7 from 7.0.85 to 7.0.89 (#3977) (diff) | |
| download | gotosocial-6f24205a26bde03e73055fd7af369352103c390f.tar.xz | |
[bugfix] Don't assume `"manuallyApprovesFollowers": true` if not set (#3978)
* [bugfix] Don't assume `"manuallyApprovesFollowers": true` if not set
* whoops, tests
| -rw-r--r-- | internal/ap/properties.go | 4 | ||||
| -rw-r--r-- | internal/typeutils/astointernal.go | 2 | ||||
| -rw-r--r-- | internal/typeutils/astointernal_test.go | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/internal/ap/properties.go b/internal/ap/properties.go index 844373510..e1dea22f0 100644 --- a/internal/ap/properties.go +++ b/internal/ap/properties.go @@ -520,11 +520,11 @@ func SetDiscoverable(with WithDiscoverable, discoverable bool) { // GetManuallyApprovesFollowers returns the boolean contained in the ManuallyApprovesFollowers property of 'with'. // -// Returns default 'true' if property unusable or not set. +// Returns default 'false' if property unusable or not set. func GetManuallyApprovesFollowers(with WithManuallyApprovesFollowers) bool { mafProp := with.GetActivityStreamsManuallyApprovesFollowers() if mafProp == nil || !mafProp.IsXMLSchemaBoolean() { - return true + return false } return mafProp.Get() } diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index 80e1de378..59c696f11 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -154,7 +154,7 @@ func (c *Converter) ASRepresentationToAccount( // Assume not memorial (todo) acct.MemorializedAt = time.Time{} - // Extract 'manuallyApprovesFollowers' aka locked account (default = true). + // Extract 'manuallyApprovesFollowers' aka locked account (default = false). manuallyApprovesFollowers := ap.GetManuallyApprovesFollowers(accountable) acct.Locked = &manuallyApprovesFollowers diff --git a/internal/typeutils/astointernal_test.go b/internal/typeutils/astointernal_test.go index 589a22df9..b49c14299 100644 --- a/internal/typeutils/astointernal_test.go +++ b/internal/typeutils/astointernal_test.go @@ -613,7 +613,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", acct.URL) suite.Equal("honk_user", acct.Username) suite.Equal("honk.example.org", acct.Domain) - suite.True(*acct.Locked) + suite.False(*acct.Locked) suite.False(*acct.Discoverable) // Store the account representation. @@ -632,7 +632,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", acct.URL) suite.Equal("honk_user", acct.Username) suite.Equal("honk.example.org", acct.Domain) - suite.True(*acct.Locked) + suite.False(*acct.Locked) suite.False(*acct.Discoverable) // Check DB version. @@ -649,7 +649,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", dbAcct.URL) suite.Equal("honk_user", dbAcct.Username) suite.Equal("honk.example.org", dbAcct.Domain) - suite.True(*dbAcct.Locked) + suite.False(*dbAcct.Locked) suite.False(*dbAcct.Discoverable) // Update the account. @@ -666,7 +666,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", acct.URL) suite.Equal("honk_user", acct.Username) suite.Equal("honk.example.org", acct.Domain) - suite.True(*acct.Locked) + suite.False(*acct.Locked) suite.False(*acct.Discoverable) // Check DB version. @@ -683,7 +683,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", dbAcct.URL) suite.Equal("honk_user", dbAcct.Username) suite.Equal("honk.example.org", dbAcct.Domain) - suite.True(*dbAcct.Locked) + suite.False(*dbAcct.Locked) suite.False(*dbAcct.Discoverable) // Clear caches. @@ -703,7 +703,7 @@ func (suite *ASToInternalTestSuite) TestParseHonkAccount() { suite.Equal("https://honk.example.org/u/honk_user", dbAcct.URL) suite.Equal("honk_user", dbAcct.Username) suite.Equal("honk.example.org", dbAcct.Domain) - suite.True(*dbAcct.Locked) + suite.False(*dbAcct.Locked) suite.False(*dbAcct.Discoverable) } |