diff --git a/internal/constants/splash.go b/internal/constants/splash.go index 229a4c2c..511e9ca1 100644 --- a/internal/constants/splash.go +++ b/internal/constants/splash.go @@ -3,8 +3,8 @@ package constants const ( // Annoucement is a message annoucement Annoucement = "Support for Mullvad" - // AnnoucementExpiration is the expiration time of the annoucement in unix timestamp - AnnoucementExpiration = 1584981407 + // AnnoucementExpiration is the expiration date of the annoucement in format yyyy-mm-dd + AnnoucementExpiration = "2020-03-15" ) const ( diff --git a/internal/constants/splash_test.go b/internal/constants/splash_test.go new file mode 100644 index 00000000..0a014b90 --- /dev/null +++ b/internal/constants/splash_test.go @@ -0,0 +1,17 @@ +package constants + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func Test_AnnoucementExpiration(t *testing.T) { + t.Parallel() + if len(AnnoucementExpiration) == 0 { + return + } + _, err := time.Parse("2006-01-02", AnnoucementExpiration) + assert.NoError(t, err) +} diff --git a/internal/params/version.go b/internal/params/version.go index 876b57dc..3241ac6d 100644 --- a/internal/params/version.go +++ b/internal/params/version.go @@ -1,21 +1,20 @@ package params import ( - "github.com/qdm12/golibs/params" libparams "github.com/qdm12/golibs/params" ) func (p *paramsReader) GetVersion() string { - version, _ := p.envParams.GetEnv("VERSION", params.Default("?"), libparams.CaseSensitiveValue()) + version, _ := p.envParams.GetEnv("VERSION", libparams.Default("?"), libparams.CaseSensitiveValue()) return version } func (p *paramsReader) GetBuildDate() string { - buildDate, _ := p.envParams.GetEnv("BUILD_DATE", params.Default("?"), libparams.CaseSensitiveValue()) + buildDate, _ := p.envParams.GetEnv("BUILD_DATE", libparams.Default("?"), libparams.CaseSensitiveValue()) return buildDate } func (p *paramsReader) GetVcsRef() string { - buildDate, _ := p.envParams.GetEnv("VCS_REF", params.Default("?"), libparams.CaseSensitiveValue()) + buildDate, _ := p.envParams.GetEnv("VCS_REF", libparams.Default("?"), libparams.CaseSensitiveValue()) return buildDate } diff --git a/internal/splash/splash.go b/internal/splash/splash.go index 737b3963..41f349e3 100644 --- a/internal/splash/splash.go +++ b/internal/splash/splash.go @@ -39,11 +39,14 @@ func title() []string { } func annoucement() []string { - timestamp := time.Now().UnixNano() / 1000000000 - if timestamp < constants.AnnoucementExpiration { - return []string{emoji.Sprint(":mega: ") + constants.Annoucement} + if len(constants.Annoucement) == 0 { + return nil } - return nil + expirationDate, _ := time.Parse("2006-01-02", constants.AnnoucementExpiration) // error covered by a unit test + if time.Now().After(expirationDate) { + return nil + } + return []string{emoji.Sprint(":mega: ") + constants.Annoucement} } func links() []string {