diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-08-15 12:35:05 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-08-15 11:35:05 +0100 |
| commit | ac6ed3d939fe9dad81aadbd04541e905c625ca82 (patch) | |
| tree | 6116baf25675837dc99f69c49b9fec2ff112ce5c /internal/trans | |
| parent | [frontend] Sensitive media spoilers (#752) (diff) | |
| download | gotosocial-ac6ed3d939fe9dad81aadbd04541e905c625ca82.tar.xz | |
[chore] Update bun / sqlite versions; update gtsmodels (#754)
* upstep bun and sqlite versions
* allow specific columns to be updated in the db
* only update necessary columns for user
* bit tidier
* only update necessary fields of media_attachment
* only update relevant instance fields
* update tests
* update only specific account columns
* use bool pointers on gtsmodels
includes attachment, status, account, user
* update columns more selectively
* test all default fields on new account insert
* updating remaining bools on gtsmodels
* initialize pointer fields when extracting AP emoji
* copy bools properly
* add copyBoolPtr convenience function + test it
* initialize false bool ptrs a bit more neatly
Diffstat (limited to 'internal/trans')
| -rw-r--r-- | internal/trans/model/account.go | 2 | ||||
| -rw-r--r-- | internal/trans/model/domainblock.go | 2 | ||||
| -rw-r--r-- | internal/trans/model/user.go | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/trans/model/account.go b/internal/trans/model/account.go index 12d54a06f..1687d7676 100644 --- a/internal/trans/model/account.go +++ b/internal/trans/model/account.go @@ -34,7 +34,7 @@ type Account struct { 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"` + Locked *bool `json:"locked" bun:",nullzero,notnull,default:true"` Language string `json:"language,omitempty" bun:",nullzero"` URI string `json:"uri" bun:",nullzero"` URL string `json:"url" bun:",nullzero"` diff --git a/internal/trans/model/domainblock.go b/internal/trans/model/domainblock.go index 48cebb4aa..5e0006bd7 100644 --- a/internal/trans/model/domainblock.go +++ b/internal/trans/model/domainblock.go @@ -29,6 +29,6 @@ type DomainBlock struct { CreatedByAccountID string `json:"createdByAccountID" bun:",nullzero"` PrivateComment string `json:"privateComment,omitempty" bun:",nullzero"` PublicComment string `json:"publicComment,omitempty" bun:",nullzero"` - Obfuscate bool `json:"obfuscate" bun:",nullzero"` + Obfuscate *bool `json:"obfuscate" bun:",nullzero,notnull,default:false"` SubscriptionID string `json:"subscriptionID,omitempty" bun:",nullzero"` } diff --git a/internal/trans/model/user.go b/internal/trans/model/user.go index 317b4debf..09e7a25a3 100644 --- a/internal/trans/model/user.go +++ b/internal/trans/model/user.go @@ -41,10 +41,10 @@ type User struct { ConfirmationSentAt *time.Time `json:"confirmationTokenSentAt,omitempty" bun:",nullzero"` ConfirmedAt *time.Time `json:"confirmedAt,omitempty" bun:",nullzero"` UnconfirmedEmail string `json:"unconfirmedEmail,omitempty" bun:",nullzero"` - Moderator bool `json:"moderator"` - Admin bool `json:"admin"` - Disabled bool `json:"disabled"` - Approved bool `json:"approved"` + Moderator *bool `json:"moderator" bun:",nullzero,notnull,default:false"` + Admin *bool `json:"admin" bun:",nullzero,notnull,default:false"` + Disabled *bool `json:"disabled" bun:",nullzero,notnull,default:false"` + Approved *bool `json:"approved" bun:",nullzero,notnull,default:false"` ResetPasswordToken string `json:"resetPasswordToken,omitempty" bun:",nullzero"` ResetPasswordSentAt *time.Time `json:"resetPasswordSentAt,omitempty" bun:",nullzero"` } |