From c1375ca5c1d5a8a645151cedfced5a336f6b7467 Mon Sep 17 00:00:00 2001 From: Daenney Date: Sun, 6 Aug 2023 12:22:40 +0200 Subject: [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. --- internal/gtsmodel/marker.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/gtsmodel/marker.go') diff --git a/internal/gtsmodel/marker.go b/internal/gtsmodel/marker.go index 3aeb376ff..93fbebfe0 100644 --- a/internal/gtsmodel/marker.go +++ b/internal/gtsmodel/marker.go @@ -21,11 +21,11 @@ import "time" // Marker stores a local account's read position on a given timeline. type Marker struct { - AccountID string `validate:"required,ulid" bun:"type:CHAR(26),pk,unique:markers_account_id_timeline_uniq,notnull,nullzero"` // ID of the local account that owns the marker - Name MarkerName `validate:"oneof=home notifications" bun:",nullzero,notnull,pk,unique:markers_account_id_timeline_uniq"` // Name of the marked timeline - UpdatedAt time.Time `validate:"required" bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // When marker was last updated - Version int `validate:"required,min=0" bun:",nullzero,notnull,default:0"` // For optimistic concurrency control - LastReadID string `validate:"required,ulid" bun:"type:CHAR(26),notnull,nullzero"` // Last ID read on this timeline (status ID for home, notification ID for notifications) + AccountID string `bun:"type:CHAR(26),pk,unique:markers_account_id_timeline_uniq,notnull,nullzero"` // ID of the local account that owns the marker + Name MarkerName `bun:",nullzero,notnull,pk,unique:markers_account_id_timeline_uniq"` // Name of the marked timeline + UpdatedAt time.Time `bun:"type:timestamptz,nullzero,notnull,default:current_timestamp"` // When marker was last updated + Version int `bun:",nullzero,notnull,default:0"` // For optimistic concurrency control + LastReadID string `bun:"type:CHAR(26),notnull,nullzero"` // Last ID read on this timeline (status ID for home, notification ID for notifications) } // MarkerName is the name of one of the timelines we can store markers for. -- cgit v1.2.3