diff --git a/ent/migrate/schema.go b/ent/migrate/schema.go index 89234e8..45b47b8 100644 --- a/ent/migrate/schema.go +++ b/ent/migrate/schema.go @@ -35,7 +35,6 @@ var ( {Name: "avatar", Type: field.TypeString, Nullable: true}, {Name: "vanity_url", Type: field.TypeString, Nullable: true}, {Name: "vanity_url_real", Type: field.TypeString, Nullable: true}, - {Name: "vac", Type: field.TypeBool, Default: false}, {Name: "vac_date", Type: field.TypeTime, Nullable: true}, {Name: "vac_count", Type: field.TypeInt, Nullable: true}, {Name: "steam_updated", Type: field.TypeTime}, diff --git a/ent/mutation.go b/ent/mutation.go index e46d6bc..8874af8 100644 --- a/ent/mutation.go +++ b/ent/mutation.go @@ -1212,7 +1212,6 @@ type PlayerMutation struct { avatar *string vanity_url *string vanity_url_real *string - vac *bool vac_date *time.Time vac_count *int addvac_count *int @@ -1514,42 +1513,6 @@ func (m *PlayerMutation) ResetVanityURLReal() { delete(m.clearedFields, player.FieldVanityURLReal) } -// SetVac sets the "vac" field. -func (m *PlayerMutation) SetVac(b bool) { - m.vac = &b -} - -// Vac returns the value of the "vac" field in the mutation. -func (m *PlayerMutation) Vac() (r bool, exists bool) { - v := m.vac - if v == nil { - return - } - return *v, true -} - -// OldVac returns the old "vac" field's value of the Player entity. -// If the Player object wasn't provided to the builder, the object is fetched from the database. -// An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *PlayerMutation) OldVac(ctx context.Context) (v bool, err error) { - if !m.op.Is(OpUpdateOne) { - return v, fmt.Errorf("OldVac is only allowed on UpdateOne operations") - } - if m.id == nil || m.oldValue == nil { - return v, fmt.Errorf("OldVac requires an ID field in the mutation") - } - oldValue, err := m.oldValue(ctx) - if err != nil { - return v, fmt.Errorf("querying old value for OldVac: %w", err) - } - return oldValue.Vac, nil -} - -// ResetVac resets all changes to the "vac" field. -func (m *PlayerMutation) ResetVac() { - m.vac = nil -} - // SetVacDate sets the "vac_date" field. func (m *PlayerMutation) SetVacDate(t time.Time) { m.vac_date = &t @@ -2028,7 +1991,7 @@ func (m *PlayerMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *PlayerMutation) Fields() []string { - fields := make([]string, 0, 12) + fields := make([]string, 0, 11) if m.name != nil { fields = append(fields, player.FieldName) } @@ -2041,9 +2004,6 @@ func (m *PlayerMutation) Fields() []string { if m.vanity_url_real != nil { fields = append(fields, player.FieldVanityURLReal) } - if m.vac != nil { - fields = append(fields, player.FieldVac) - } if m.vac_date != nil { fields = append(fields, player.FieldVacDate) } @@ -2081,8 +2041,6 @@ func (m *PlayerMutation) Field(name string) (ent.Value, bool) { return m.VanityURL() case player.FieldVanityURLReal: return m.VanityURLReal() - case player.FieldVac: - return m.Vac() case player.FieldVacDate: return m.VacDate() case player.FieldVacCount: @@ -2114,8 +2072,6 @@ func (m *PlayerMutation) OldField(ctx context.Context, name string) (ent.Value, return m.OldVanityURL(ctx) case player.FieldVanityURLReal: return m.OldVanityURLReal(ctx) - case player.FieldVac: - return m.OldVac(ctx) case player.FieldVacDate: return m.OldVacDate(ctx) case player.FieldVacCount: @@ -2167,13 +2123,6 @@ func (m *PlayerMutation) SetField(name string, value ent.Value) error { } m.SetVanityURLReal(v) return nil - case player.FieldVac: - v, ok := value.(bool) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.SetVac(v) - return nil case player.FieldVacDate: v, ok := value.(time.Time) if !ok { @@ -2362,9 +2311,6 @@ func (m *PlayerMutation) ResetField(name string) error { case player.FieldVanityURLReal: m.ResetVanityURLReal() return nil - case player.FieldVac: - m.ResetVac() - return nil case player.FieldVacDate: m.ResetVacDate() return nil diff --git a/ent/player.go b/ent/player.go index 57dfb42..23505db 100644 --- a/ent/player.go +++ b/ent/player.go @@ -24,8 +24,6 @@ type Player struct { VanityURL string `json:"vanity_url,omitempty"` // VanityURLReal holds the value of the "vanity_url_real" field. VanityURLReal string `json:"vanity_url_real,omitempty"` - // Vac holds the value of the "vac" field. - Vac bool `json:"vac,omitempty"` // VacDate holds the value of the "vac_date" field. VacDate time.Time `json:"vac_date,omitempty"` // VacCount holds the value of the "vac_count" field. @@ -79,8 +77,6 @@ func (*Player) scanValues(columns []string) ([]interface{}, error) { values := make([]interface{}, len(columns)) for i := range columns { switch columns[i] { - case player.FieldVac: - values[i] = new(sql.NullBool) case player.FieldID, player.FieldVacCount: values[i] = new(sql.NullInt64) case player.FieldName, player.FieldAvatar, player.FieldVanityURL, player.FieldVanityURLReal, player.FieldAuthCode, player.FieldOldestSharecodeSeen: @@ -132,12 +128,6 @@ func (pl *Player) assignValues(columns []string, values []interface{}) error { } else if value.Valid { pl.VanityURLReal = value.String } - case player.FieldVac: - if value, ok := values[i].(*sql.NullBool); !ok { - return fmt.Errorf("unexpected type %T for field vac", values[i]) - } else if value.Valid { - pl.Vac = value.Bool - } case player.FieldVacDate: if value, ok := values[i].(*sql.NullTime); !ok { return fmt.Errorf("unexpected type %T for field vac_date", values[i]) @@ -226,8 +216,6 @@ func (pl *Player) String() string { builder.WriteString(pl.VanityURL) builder.WriteString(", vanity_url_real=") builder.WriteString(pl.VanityURLReal) - builder.WriteString(", vac=") - builder.WriteString(fmt.Sprintf("%v", pl.Vac)) builder.WriteString(", vac_date=") builder.WriteString(pl.VacDate.Format(time.ANSIC)) builder.WriteString(", vac_count=") diff --git a/ent/player/player.go b/ent/player/player.go index 4a223bc..8743e90 100644 --- a/ent/player/player.go +++ b/ent/player/player.go @@ -19,8 +19,6 @@ const ( FieldVanityURL = "vanity_url" // FieldVanityURLReal holds the string denoting the vanity_url_real field in the database. FieldVanityURLReal = "vanity_url_real" - // FieldVac holds the string denoting the vac field in the database. - FieldVac = "vac" // FieldVacDate holds the string denoting the vac_date field in the database. FieldVacDate = "vac_date" // FieldVacCount holds the string denoting the vac_count field in the database. @@ -62,7 +60,6 @@ var Columns = []string{ FieldAvatar, FieldVanityURL, FieldVanityURLReal, - FieldVac, FieldVacDate, FieldVacCount, FieldSteamUpdated, @@ -89,8 +86,6 @@ func ValidColumn(column string) bool { } var ( - // DefaultVac holds the default value on creation for the "vac" field. - DefaultVac bool // DefaultSteamUpdated holds the default value on creation for the "steam_updated" field. DefaultSteamUpdated func() time.Time ) diff --git a/ent/player/where.go b/ent/player/where.go index 7de79fb..7f32ca6 100644 --- a/ent/player/where.go +++ b/ent/player/where.go @@ -121,13 +121,6 @@ func VanityURLReal(v string) predicate.Player { }) } -// Vac applies equality check predicate on the "vac" field. It's identical to VacEQ. -func Vac(v bool) predicate.Player { - return predicate.Player(func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldVac), v)) - }) -} - // VacDate applies equality check predicate on the "vac_date" field. It's identical to VacDateEQ. func VacDate(v time.Time) predicate.Player { return predicate.Player(func(s *sql.Selector) { @@ -677,20 +670,6 @@ func VanityURLRealContainsFold(v string) predicate.Player { }) } -// VacEQ applies the EQ predicate on the "vac" field. -func VacEQ(v bool) predicate.Player { - return predicate.Player(func(s *sql.Selector) { - s.Where(sql.EQ(s.C(FieldVac), v)) - }) -} - -// VacNEQ applies the NEQ predicate on the "vac" field. -func VacNEQ(v bool) predicate.Player { - return predicate.Player(func(s *sql.Selector) { - s.Where(sql.NEQ(s.C(FieldVac), v)) - }) -} - // VacDateEQ applies the EQ predicate on the "vac_date" field. func VacDateEQ(v time.Time) predicate.Player { return predicate.Player(func(s *sql.Selector) { diff --git a/ent/player_create.go b/ent/player_create.go index 5fe0208..3195e1d 100644 --- a/ent/player_create.go +++ b/ent/player_create.go @@ -78,20 +78,6 @@ func (pc *PlayerCreate) SetNillableVanityURLReal(s *string) *PlayerCreate { return pc } -// SetVac sets the "vac" field. -func (pc *PlayerCreate) SetVac(b bool) *PlayerCreate { - pc.mutation.SetVac(b) - return pc -} - -// SetNillableVac sets the "vac" field if the given value is not nil. -func (pc *PlayerCreate) SetNillableVac(b *bool) *PlayerCreate { - if b != nil { - pc.SetVac(*b) - } - return pc -} - // SetVacDate sets the "vac_date" field. func (pc *PlayerCreate) SetVacDate(t time.Time) *PlayerCreate { pc.mutation.SetVacDate(t) @@ -297,10 +283,6 @@ func (pc *PlayerCreate) ExecX(ctx context.Context) { // defaults sets the default values of the builder before save. func (pc *PlayerCreate) defaults() { - if _, ok := pc.mutation.Vac(); !ok { - v := player.DefaultVac - pc.mutation.SetVac(v) - } if _, ok := pc.mutation.SteamUpdated(); !ok { v := player.DefaultSteamUpdated() pc.mutation.SetSteamUpdated(v) @@ -309,9 +291,6 @@ func (pc *PlayerCreate) defaults() { // check runs all checks and user-defined validators on the builder. func (pc *PlayerCreate) check() error { - if _, ok := pc.mutation.Vac(); !ok { - return &ValidationError{Name: "vac", err: errors.New(`ent: missing required field "vac"`)} - } if _, ok := pc.mutation.SteamUpdated(); !ok { return &ValidationError{Name: "steam_updated", err: errors.New(`ent: missing required field "steam_updated"`)} } @@ -380,14 +359,6 @@ func (pc *PlayerCreate) createSpec() (*Player, *sqlgraph.CreateSpec) { }) _node.VanityURLReal = value } - if value, ok := pc.mutation.Vac(); ok { - _spec.Fields = append(_spec.Fields, &sqlgraph.FieldSpec{ - Type: field.TypeBool, - Value: value, - Column: player.FieldVac, - }) - _node.Vac = value - } if value, ok := pc.mutation.VacDate(); ok { _spec.Fields = append(_spec.Fields, &sqlgraph.FieldSpec{ Type: field.TypeTime, diff --git a/ent/player_update.go b/ent/player_update.go index 18a9424..3a77972 100644 --- a/ent/player_update.go +++ b/ent/player_update.go @@ -109,20 +109,6 @@ func (pu *PlayerUpdate) ClearVanityURLReal() *PlayerUpdate { return pu } -// SetVac sets the "vac" field. -func (pu *PlayerUpdate) SetVac(b bool) *PlayerUpdate { - pu.mutation.SetVac(b) - return pu -} - -// SetNillableVac sets the "vac" field if the given value is not nil. -func (pu *PlayerUpdate) SetNillableVac(b *bool) *PlayerUpdate { - if b != nil { - pu.SetVac(*b) - } - return pu -} - // SetVacDate sets the "vac_date" field. func (pu *PlayerUpdate) SetVacDate(t time.Time) *PlayerUpdate { pu.mutation.SetVacDate(t) @@ -465,13 +451,6 @@ func (pu *PlayerUpdate) sqlSave(ctx context.Context) (n int, err error) { Column: player.FieldVanityURLReal, }) } - if value, ok := pu.mutation.Vac(); ok { - _spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{ - Type: field.TypeBool, - Value: value, - Column: player.FieldVac, - }) - } if value, ok := pu.mutation.VacDate(); ok { _spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{ Type: field.TypeTime, @@ -771,20 +750,6 @@ func (puo *PlayerUpdateOne) ClearVanityURLReal() *PlayerUpdateOne { return puo } -// SetVac sets the "vac" field. -func (puo *PlayerUpdateOne) SetVac(b bool) *PlayerUpdateOne { - puo.mutation.SetVac(b) - return puo -} - -// SetNillableVac sets the "vac" field if the given value is not nil. -func (puo *PlayerUpdateOne) SetNillableVac(b *bool) *PlayerUpdateOne { - if b != nil { - puo.SetVac(*b) - } - return puo -} - // SetVacDate sets the "vac_date" field. func (puo *PlayerUpdateOne) SetVacDate(t time.Time) *PlayerUpdateOne { puo.mutation.SetVacDate(t) @@ -1151,13 +1116,6 @@ func (puo *PlayerUpdateOne) sqlSave(ctx context.Context) (_node *Player, err err Column: player.FieldVanityURLReal, }) } - if value, ok := puo.mutation.Vac(); ok { - _spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{ - Type: field.TypeBool, - Value: value, - Column: player.FieldVac, - }) - } if value, ok := puo.mutation.VacDate(); ok { _spec.Fields.Set = append(_spec.Fields.Set, &sqlgraph.FieldSpec{ Type: field.TypeTime, diff --git a/ent/runtime.go b/ent/runtime.go index 3ebb57d..66aba5e 100644 --- a/ent/runtime.go +++ b/ent/runtime.go @@ -21,12 +21,8 @@ func init() { match.DefaultDemoParsed = matchDescDemoParsed.Default.(bool) playerFields := schema.Player{}.Fields() _ = playerFields - // playerDescVac is the schema descriptor for vac field. - playerDescVac := playerFields[5].Descriptor() - // player.DefaultVac holds the default value on creation for the vac field. - player.DefaultVac = playerDescVac.Default.(bool) // playerDescSteamUpdated is the schema descriptor for steam_updated field. - playerDescSteamUpdated := playerFields[8].Descriptor() + playerDescSteamUpdated := playerFields[7].Descriptor() // player.DefaultSteamUpdated holds the default value on creation for the steam_updated field. player.DefaultSteamUpdated = playerDescSteamUpdated.Default.(func() time.Time) } diff --git a/ent/schema/player.go b/ent/schema/player.go index 0ace32c..e24db28 100644 --- a/ent/schema/player.go +++ b/ent/schema/player.go @@ -20,7 +20,6 @@ func (Player) Fields() []ent.Field { field.String("avatar").Optional(), field.String("vanity_url").Optional(), field.String("vanity_url_real").Optional(), - field.Bool("vac").Default(false), field.Time("vac_date").Optional(), field.Int("vac_count").Optional(), field.Time("steam_updated").Default(func() time.Time { diff --git a/main.go b/main.go index 0247a53..503a4a0 100644 --- a/main.go +++ b/main.go @@ -174,7 +174,7 @@ func getPlayer(w http.ResponseWriter, r *http.Request) { SteamID64: tPlayer.ID, Name: tPlayer.Name, Avatar: tPlayer.Avatar, - VAC: tPlayer.Vac, + VAC: !tPlayer.VacDate.IsZero(), VanityURL: tPlayer.VanityURLReal, Tracked: tPlayer.AuthCode != "", Matches: []*utils.MatchResponse{}, @@ -622,7 +622,7 @@ func getMatch(w http.ResponseWriter, r *http.Request) { SteamID64: iStats.Edges.Players.ID, Name: iStats.Edges.Players.Name, Avatar: iStats.Edges.Players.Avatar, - VAC: iStats.Edges.Players.Vac, + VAC: !iStats.Edges.Players.VacDate.IsZero(), VanityURL: iStats.Edges.Players.VanityURLReal, Tracked: iStats.Edges.Players.AuthCode != "", },