From 7f4a0a1aeb8a294ee967c63d7a48446df013ec44 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 22 Mar 2024 14:03:46 +0100 Subject: [chore] Move local account settings to separate db table (#2770) * [chore] Move local account settings to separate database model * don't use separate settings_id --- internal/cache/size.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'internal/cache/size.go') diff --git a/internal/cache/size.go b/internal/cache/size.go index b1c431c55..080fefea3 100644 --- a/internal/cache/size.go +++ b/internal/cache/size.go @@ -28,6 +28,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" + "github.com/superseriousbusiness/gotosocial/internal/util" ) const ( @@ -219,9 +220,6 @@ func sizeofAccount() uintptr { Bot: func() *bool { ok := true; return &ok }(), Locked: func() *bool { ok := true; return &ok }(), Discoverable: func() *bool { ok := false; return &ok }(), - Privacy: gtsmodel.VisibilityFollowersOnly, - Sensitive: func() *bool { ok := true; return &ok }(), - Language: "fr", URI: exampleURI, URL: exampleURI, InboxURI: exampleURI, @@ -236,9 +234,7 @@ func sizeofAccount() uintptr { SensitizedAt: exampleTime, SilencedAt: exampleTime, SuspendedAt: exampleTime, - HideCollections: func() *bool { ok := true; return &ok }(), SuspensionOrigin: exampleID, - EnableRSS: func() *bool { ok := true; return &ok }(), })) } @@ -251,6 +247,22 @@ func sizeofAccountNote() uintptr { })) } +func sizeofAccountSettings() uintptr { + return uintptr(size.Of(>smodel.AccountSettings{ + AccountID: exampleID, + CreatedAt: exampleTime, + UpdatedAt: exampleTime, + Reason: exampleText, + Privacy: gtsmodel.VisibilityFollowersOnly, + Sensitive: util.Ptr(true), + Language: "fr", + StatusContentType: "text/plain", + CustomCSS: exampleText, + EnableRSS: util.Ptr(true), + HideCollections: util.Ptr(false), + })) +} + func sizeofApplication() uintptr { return uintptr(size.Of(>smodel.Application{ ID: exampleID, -- cgit v1.2.3