diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2023-08-06 12:22:40 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-06 12:22:40 +0200 |
| commit | c1375ca5c1d5a8a645151cedfced5a336f6b7467 (patch) | |
| tree | c3cc68d992811de674458e646af16f4659926ec7 /internal/gtsmodel/followrequest.go | |
| parent | [bugfix] update cache library with nil ptr fix (#2070) (diff) | |
| download | gotosocial-c1375ca5c1d5a8a645151cedfced5a336f6b7467.tar.xz | |
[chore] Remove go-playground/validator (#2069)
* [chore] Remove go-playground/validator
It turns out we're not actually using the validator code. This is a
remnant from when we intended to use it, but the presence of it and its
struct tags creates the illusion we're validating a lot of things we're
not. It resulted in some confusion when we were trying to figure out
language valdiation.
Remove all this code, so that only the validation functions from the
validate package we actually use remain. I'm not touching the struct
tags in the migrations in order to avoid things potentially thinking
migrations need to be re-run.
* [chore] Bring back a struct tag on api
The validate on internal/api is Gin doing form validation, not the
validator from go-playground/validator.
Diffstat (limited to 'internal/gtsmodel/followrequest.go')
| -rw-r--r-- | internal/gtsmodel/followrequest.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/internal/gtsmodel/followrequest.go b/internal/gtsmodel/followrequest.go index 3fc161af7..32eb13950 100644 --- a/internal/gtsmodel/followrequest.go +++ b/internal/gtsmodel/followrequest.go @@ -21,14 +21,14 @@ import "time" // FollowRequest represents one account requesting to follow another, and the metadata around that request. type FollowRequest struct { - ID string `validate:"required,ulid" bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database - CreatedAt time.Time `validate:"-" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created - UpdatedAt time.Time `validate:"-" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item last updated - URI string `validate:"required,url" bun:",notnull,nullzero,unique"` // ActivityPub uri of this follow (request). - AccountID string `validate:"required,ulid" bun:"type:CHAR(26),unique:frsrctarget,notnull,nullzero"` // Who does this follow request originate from? - Account *Account `validate:"-" bun:"rel:belongs-to"` // Account corresponding to accountID - TargetAccountID string `validate:"required,ulid" bun:"type:CHAR(26),unique:frsrctarget,notnull,nullzero"` // Who is the target of this follow request? - TargetAccount *Account `validate:"-" bun:"rel:belongs-to"` // Account corresponding to targetAccountID - ShowReblogs *bool `validate:"-" bun:",nullzero,notnull,default:true"` // Does this follow also want to see reblogs and not just posts? - Notify *bool `validate:"-" bun:",nullzero,notnull,default:false"` // does the following account want to be notified when the followed account posts? + ID string `bun:"type:CHAR(26),pk,nullzero,notnull,unique"` // id of this item in the database + CreatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item created + UpdatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // when was item last updated + URI string `bun:",notnull,nullzero,unique"` // ActivityPub uri of this follow (request). + AccountID string `bun:"type:CHAR(26),unique:frsrctarget,notnull,nullzero"` // Who does this follow request originate from? + Account *Account `bun:"rel:belongs-to"` // Account corresponding to accountID + TargetAccountID string `bun:"type:CHAR(26),unique:frsrctarget,notnull,nullzero"` // Who is the target of this follow request? + TargetAccount *Account `bun:"rel:belongs-to"` // Account corresponding to targetAccountID + ShowReblogs *bool `bun:",nullzero,notnull,default:true"` // Does this follow also want to see reblogs and not just posts? + Notify *bool `bun:",nullzero,notnull,default:false"` // does the following account want to be notified when the followed account posts? } |