From 850c564de1d2c86bc772081131a506d760ab3abb Mon Sep 17 00:00:00 2001 From: "kim (grufwub)" Date: Thu, 26 Aug 2021 21:46:24 +0100 Subject: [PATCH] remove unnecessary notnulls Signed-off-by: kim (grufwub) --- internal/gtsmodel/account.go | 8 ++++---- internal/gtsmodel/follow.go | 2 +- internal/gtsmodel/followrequest.go | 2 +- internal/gtsmodel/status.go | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/gtsmodel/account.go b/internal/gtsmodel/account.go index 3eff69582..87b0ff3af 100644 --- a/internal/gtsmodel/account.go +++ b/internal/gtsmodel/account.go @@ -78,13 +78,13 @@ type Account struct { */ // Does this account need an approval for new followers? - Locked bool `bun:",nullzero,notnull,default:true"` + Locked bool `bun:",nullzero,default:true"` // Should this account be shown in the instance's profile directory? - Discoverable bool `bun:",nullzero,notnull,default:false"` + Discoverable bool `bun:",nullzero,default:false"` // Default post privacy for this account - Privacy Visibility `bun:",nullzero,notnull,default:'public'"` + Privacy Visibility `bun:",nullzero,default:'public'"` // Set posts from this account to sensitive by default? - Sensitive bool `bun:",nullzero,notnull,default:false"` + Sensitive bool `bun:",nullzero,default:false"` // What language does this account post in? Language string `bun:",nullzero,notnull,default:'en'"` diff --git a/internal/gtsmodel/follow.go b/internal/gtsmodel/follow.go index 0ad276345..45d04bd22 100644 --- a/internal/gtsmodel/follow.go +++ b/internal/gtsmodel/follow.go @@ -35,7 +35,7 @@ type Follow struct { TargetAccountID string `bun:"type:CHAR(26),unique:srctarget,notnull"` TargetAccount *Account `bun:"rel:belongs-to"` // Does this follow also want to see reblogs and not just posts? - ShowReblogs bool `bun:",nullzero,notnull,default:true"` + ShowReblogs bool `bun:",nullzero,default:true"` // What is the activitypub URI of this follow? URI string `bun:",unique,nullzero"` // does the following account want to be notified when the followed account posts? diff --git a/internal/gtsmodel/followrequest.go b/internal/gtsmodel/followrequest.go index ce0c98a96..b8f189df9 100644 --- a/internal/gtsmodel/followrequest.go +++ b/internal/gtsmodel/followrequest.go @@ -35,7 +35,7 @@ type FollowRequest struct { TargetAccountID string `bun:"type:CHAR(26),unique:frsrctarget,notnull"` TargetAccount *Account `bun:"rel:belongs-to"` // Does this follow also want to see reblogs and not just posts? - ShowReblogs bool `bun:",nullzero,notnull,default:true"` + ShowReblogs bool `bun:",nullzero,default:true"` // What is the activitypub URI of this follow request? URI string `bun:",unique,nullzero"` // does the following account want to be notified when the followed account posts? diff --git a/internal/gtsmodel/status.go b/internal/gtsmodel/status.go index 47df86cad..2dc94a087 100644 --- a/internal/gtsmodel/status.go +++ b/internal/gtsmodel/status.go @@ -138,11 +138,11 @@ const ( // If DIRECT is selected, boostable will be FALSE, and all other flags will be TRUE. type VisibilityAdvanced struct { // This status will be federated beyond the local timeline(s) - Federated bool `bun:",nullzero,notnull,default:true"` + Federated bool `bun:",nullzero,default:true"` // This status can be boosted/reblogged - Boostable bool `bun:",nullzero,notnull,default:true"` + Boostable bool `bun:",nullzero,default:true"` // This status can be replied to - Replyable bool `bun:",nullzero,notnull,default:true"` + Replyable bool `bun:",nullzero,default:true"` // This status can be liked/faved - Likeable bool `bun:",nullzero,notnull,default:true"` + Likeable bool `bun:",nullzero,default:true"` }