diff options
Diffstat (limited to 'internal/typeutils')
| -rw-r--r-- | internal/typeutils/astointernal.go | 10 | ||||
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 31 |
2 files changed, 21 insertions, 20 deletions
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index b262030de..b5e713554 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -130,13 +130,8 @@ func (c *Converter) ASRepresentationToAccount(ctx context.Context, accountable a // Extract account note (bio / summary). acct.Note = ap.ExtractSummary(accountable) - // Assume: - // - memorial (TODO) - // - sensitive (TODO) - // - hide collections (TODO) + // Assume not memorial (todo) acct.Memorial = util.Ptr(false) - acct.Sensitive = util.Ptr(false) - acct.HideCollections = util.Ptr(false) // Extract 'manuallyApprovesFollowers' aka locked account (default = true). manuallyApprovesFollowers := ap.GetManuallyApprovesFollowers(accountable) @@ -146,9 +141,6 @@ func (c *Converter) ASRepresentationToAccount(ctx context.Context, accountable a discoverable := ap.GetDiscoverable(accountable) acct.Discoverable = &discoverable - // Assume not an RSS feed. - acct.EnableRSS = util.Ptr(false) - // Extract the URL property. urls := ap.GetURL(accountable) if len(urls) == 0 { diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index df4598deb..0ff3c2268 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -78,14 +78,14 @@ func (c *Converter) AccountToAPIAccountSensitive(ctx context.Context, a *gtsmode } statusContentType := string(apimodel.StatusContentTypeDefault) - if a.StatusContentType != "" { - statusContentType = a.StatusContentType + if a.Settings.StatusContentType != "" { + statusContentType = a.Settings.StatusContentType } apiAccount.Source = &apimodel.Source{ - Privacy: c.VisToAPIVis(ctx, a.Privacy), - Sensitive: *a.Sensitive, - Language: a.Language, + Privacy: c.VisToAPIVis(ctx, a.Settings.Privacy), + Sensitive: *a.Settings.Sensitive, + Language: a.Settings.Language, StatusContentType: statusContentType, Note: a.NoteRaw, Fields: c.fieldsToAPIFields(a.FieldsRaw), @@ -170,10 +170,13 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A // Bits that vary between remote + local accounts: // - Account (acct) string. // - Role. + // - Settings things (enableRSS, customCSS). var ( - acct string - role *apimodel.AccountRole + acct string + role *apimodel.AccountRole + enableRSS bool + customCSS string ) if a.IsRemote() { @@ -203,6 +206,9 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A default: role = &apimodel.AccountRole{Name: apimodel.AccountRoleUser} } + + enableRSS = *a.Settings.EnableRSS + customCSS = a.Settings.CustomCSS } acct = a.Username // omit domain @@ -239,7 +245,6 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A locked = boolPtrDef("locked", a.Locked, true) discoverable = boolPtrDef("discoverable", a.Discoverable, false) bot = boolPtrDef("bot", a.Bot, false) - enableRSS = boolPtrDef("enableRSS", a.EnableRSS, false) ) // Remaining properties are simple and @@ -267,7 +272,7 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A Emojis: apiEmojis, Fields: fields, Suspended: !a.SuspendedAt.IsZero(), - CustomCSS: a.CustomCSS, + CustomCSS: customCSS, EnableRSS: enableRSS, Role: role, Moved: moved, @@ -376,6 +381,10 @@ func (c *Converter) AccountToAdminAPIAccount(ctx context.Context, a *gtsmodel.Ac createdByApplicationID string ) + if err := c.state.DB.PopulateAccount(ctx, a); err != nil { + log.Errorf(ctx, "error(s) populating account, will continue: %s", err) + } + if a.IsRemote() { // Domain may be in Punycode, // de-punify it just in case. @@ -404,8 +413,8 @@ func (c *Converter) AccountToAdminAPIAccount(ctx context.Context, a *gtsmodel.Ac } locale = user.Locale - if user.Account.Reason != "" { - inviteRequest = &user.Account.Reason + if a.Settings.Reason != "" { + inviteRequest = &a.Settings.Reason } if *user.Admin { |