Browse Source

[bugfix] Don't assume `"manuallyApprovesFollowers": true` if not set (#3978)

* [bugfix] Don't assume `"manuallyApprovesFollowers": true` if not set

* whoops, tests
pull/3747/merge
tobi 11 months ago committed by GitHub
parent
commit
6f24205a26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      internal/ap/properties.go
  2. 2
      internal/typeutils/astointernal.go
  3. 12
      internal/typeutils/astointernal_test.go

4
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()
}

2
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

12
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)
}

Loading…
Cancel
Save