summaryrefslogtreecommitdiff
path: root/internal/typeutils/internaltofrontend.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2024-04-02 11:42:24 +0200
committerLibravatar GitHub <noreply@github.com>2024-04-02 10:42:24 +0100
commitf05874be3095d3fb3cefd1a92b3c35fe3ae3bf28 (patch)
tree52f1616259b51d0a8a94a786278b9c0aa5ab2298 /internal/typeutils/internaltofrontend.go
parent[feature] Add `enable` command to mirror existing `disable` command; update d... (diff)
downloadgotosocial-f05874be3095d3fb3cefd1a92b3c35fe3ae3bf28.tar.xz
[feature] Option to hide followers/following (#2788)
Diffstat (limited to 'internal/typeutils/internaltofrontend.go')
-rw-r--r--internal/typeutils/internaltofrontend.go67
1 files changed, 35 insertions, 32 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index bf44c7254..daa3568a7 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -170,14 +170,15 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
// Bits that vary between remote + local accounts:
// - Account (acct) string.
// - Role.
- // - Settings things (enableRSS, theme, customCSS).
+ // - Settings things (enableRSS, theme, customCSS, hideCollections).
var (
- acct string
- role *apimodel.AccountRole
- enableRSS bool
- theme string
- customCSS string
+ acct string
+ role *apimodel.AccountRole
+ enableRSS bool
+ theme string
+ customCSS string
+ hideCollections bool
)
if a.IsRemote() {
@@ -211,6 +212,7 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
enableRSS = *a.Settings.EnableRSS
theme = a.Settings.Theme
customCSS = a.Settings.CustomCSS
+ hideCollections = *a.Settings.HideCollections
}
acct = a.Username // omit domain
@@ -253,32 +255,33 @@ func (c *Converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
// can be populated directly below.
accountFrontend := &apimodel.Account{
- ID: a.ID,
- Username: a.Username,
- Acct: acct,
- DisplayName: a.DisplayName,
- Locked: locked,
- Discoverable: discoverable,
- Bot: bot,
- CreatedAt: util.FormatISO8601(a.CreatedAt),
- Note: a.Note,
- URL: a.URL,
- Avatar: aviURL,
- AvatarStatic: aviURLStatic,
- Header: headerURL,
- HeaderStatic: headerURLStatic,
- FollowersCount: followersCount,
- FollowingCount: followingCount,
- StatusesCount: statusesCount,
- LastStatusAt: lastStatusAt,
- Emojis: apiEmojis,
- Fields: fields,
- Suspended: !a.SuspendedAt.IsZero(),
- Theme: theme,
- CustomCSS: customCSS,
- EnableRSS: enableRSS,
- Role: role,
- Moved: moved,
+ ID: a.ID,
+ Username: a.Username,
+ Acct: acct,
+ DisplayName: a.DisplayName,
+ Locked: locked,
+ Discoverable: discoverable,
+ Bot: bot,
+ CreatedAt: util.FormatISO8601(a.CreatedAt),
+ Note: a.Note,
+ URL: a.URL,
+ Avatar: aviURL,
+ AvatarStatic: aviURLStatic,
+ Header: headerURL,
+ HeaderStatic: headerURLStatic,
+ FollowersCount: followersCount,
+ FollowingCount: followingCount,
+ StatusesCount: statusesCount,
+ LastStatusAt: lastStatusAt,
+ Emojis: apiEmojis,
+ Fields: fields,
+ Suspended: !a.SuspendedAt.IsZero(),
+ Theme: theme,
+ CustomCSS: customCSS,
+ EnableRSS: enableRSS,
+ HideCollections: hideCollections,
+ Role: role,
+ Moved: moved,
}
// Bodge default avatar + header in,