diff options
author | 2022-08-22 11:21:36 +0200 | |
---|---|---|
committer | 2022-08-22 11:21:36 +0200 | |
commit | b96533ca8f4d155e87e5325b4b192894d7d3e077 (patch) | |
tree | 936fc6fa01dd98a78adc4396e6e289bddf8344bc /internal/trans/model/account.go | |
parent | [bugfix] Fix potential dereference of accounts on own instance (#757) (diff) | |
download | gotosocial-b96533ca8f4d155e87e5325b4b192894d7d3e077.tar.xz |
[bugfix] Fix loss of account info on export/import, add tests (#759)
* start adding additional tests
* use random database address for in-memory sqlite
* add more fields to account export
Diffstat (limited to 'internal/trans/model/account.go')
-rw-r--r-- | internal/trans/model/account.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/internal/trans/model/account.go b/internal/trans/model/account.go index 1687d7676..e8abaf86f 100644 --- a/internal/trans/model/account.go +++ b/internal/trans/model/account.go @@ -29,15 +29,24 @@ type Account struct { ID string `json:"id" bun:",nullzero"` CreatedAt *time.Time `json:"createdAt" bun:",nullzero"` Username string `json:"username" bun:",nullzero"` - DisplayName string `json:"displayName,omitempty" bun:",nullzero"` - Note string `json:"note,omitempty" bun:",nullzero"` Domain string `json:"domain,omitempty" bun:",nullzero"` HeaderRemoteURL string `json:"headerRemoteURL,omitempty" bun:",nullzero"` AvatarRemoteURL string `json:"avatarRemoteURL,omitempty" bun:",nullzero"` - Locked *bool `json:"locked" bun:",nullzero,notnull,default:true"` + DisplayName string `json:"displayName,omitempty" bun:",nullzero"` + Note string `json:"note,omitempty" bun:",nullzero"` + NoteRaw string `json:"noteRaw,omitempty" bun:",nullzero"` + Memorial *bool `json:"memorial"` + Bot *bool `json:"bot"` + Reason string `json:"reason,omitempty" bun:",nullzero"` + Locked *bool `json:"locked"` + Discoverable *bool `json:"discoverable"` + Privacy string `json:"privacy,omitempty" bun:",nullzero"` + Sensitive *bool `json:"sensitive"` Language string `json:"language,omitempty" bun:",nullzero"` + StatusFormat string `json:"statusFormat,omitempty" bun:",nullzero"` URI string `json:"uri" bun:",nullzero"` URL string `json:"url" bun:",nullzero"` + LastWebfingeredAt *time.Time `json:"lastWebfingeredAt,omitempty" bun:",nullzero"` InboxURI string `json:"inboxURI" bun:",nullzero"` OutboxURI string `json:"outboxURI" bun:",nullzero"` FollowingURI string `json:"followingUri" bun:",nullzero"` @@ -49,6 +58,9 @@ type Account struct { PublicKey *rsa.PublicKey `json:"-" mapstructure:"-"` PublicKeyString string `json:"publicKey,omitempty" mapstructure:"publicKey" bun:"-"` PublicKeyURI string `json:"publicKeyUri" bun:",nullzero"` + SensitizedAt *time.Time `json:"sensitizedAt,omitempty" bun:",nullzero"` + SilencedAt *time.Time `json:"silencedAt,omitempty" bun:",nullzero"` SuspendedAt *time.Time `json:"suspendedAt,omitempty" bun:",nullzero"` + HideCollections *bool `json:"hideCollections"` SuspensionOrigin string `json:"suspensionOrigin,omitempty" bun:",nullzero"` } |