diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-01-19 14:02:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-19 13:02:04 +0000 |
| commit | 5ca86b1c575f9c42ad8d3d4a2b2d3e70c89e90df (patch) | |
| tree | 3ac7578cd35b9c2f1dfb3903ef769d32f9c58d3d /internal/typeutils/astointernal.go | |
| parent | [performance] overhaul struct (+ result) caching library for simplicity, perf... (diff) | |
| download | gotosocial-5ca86b1c575f9c42ad8d3d4a2b2d3e70c89e90df.tar.xz | |
[chore] Harden up boolptr logic on Accounts, warn if not set (#2544)
Diffstat (limited to 'internal/typeutils/astointernal.go')
| -rw-r--r-- | internal/typeutils/astointernal.go | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index ec17527c4..8a451adc8 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -126,23 +126,9 @@ func (c *Converter) ASRepresentationToAccount(ctx context.Context, accountable a acct.Sensitive = util.Ptr(false) acct.HideCollections = util.Ptr(false) - // Extract 'manuallyApprovesFollowers', (i.e. locked account) - maf := accountable.GetActivityStreamsManuallyApprovesFollowers() - - switch { - case maf != nil && !maf.IsXMLSchemaBoolean(): - log.Warnf(ctx, "unusable manuallyApprovesFollowers for %s", uri) - fallthrough - - case maf == nil: - // None given, use default. - acct.Locked = util.Ptr(true) - - default: - // Valid bool provided. - locked := maf.Get() - acct.Locked = &locked - } + // Extract 'manuallyApprovesFollowers' aka locked account (default = true). + manuallyApprovesFollowers := ap.GetManuallyApprovesFollowers(accountable) + acct.Locked = &manuallyApprovesFollowers // Extract account discoverability (default = false). discoverable := ap.GetDiscoverable(accountable) |