feat: allow specifying timezone in config

config.example.toml

@@ -9,6 +9,8 @@ mutes-path = "cosmos-proposals-checker-mutes.json"
 # See https://pkg.go.dev/github.com/robfig/cron?utm_source=godoc#hdr-CRON_Expression_Format for examples.
 # Defaults to "@hourly"
 interval = "@hourly"
+# Timezone in which time (like undelegation finish time) will be displayed. Defaults to "Etc/GMT", so UTC+0
+timezone = "Europe/Moscow"
 
 # Logging configuration
 [log]

pkg/app.go

@@ -10,6 +10,7 @@ import (
 	"main/pkg/reporters/telegram"
 	"main/pkg/state"
 	"main/pkg/types"
+	"time"
 
 	"github.com/robfig/cron/v3"
 	"github.com/rs/zerolog"
@@ -43,6 +44,8 @@ func NewApp(configPath string, version string) *App {
 	stateGenerator := state.NewStateGenerator(log, config.Chains)
 	dataManager := data.NewManager(log, config.Chains)
 
+	timeZone, _ := time.LoadLocation(config.Timezone)
+
 	return &App{
 		Logger:          log,
 		Config:          config,
@@ -52,7 +55,7 @@ func NewApp(configPath string, version string) *App {
 		StateGenerator:  stateGenerator,
 		Reporters: []reportersPkg.Reporter{
 			pagerduty.NewPagerDutyReporter(config.PagerDutyConfig, log),
-			telegram.NewTelegramReporter(config.TelegramConfig, mutesManager, stateGenerator, dataManager, log, version),
+			telegram.NewTelegramReporter(config.TelegramConfig, mutesManager, stateGenerator, dataManager, log, version, timeZone),
 		},
 	}
 }

pkg/mutes/mutes.go

@@ -49,10 +49,6 @@ func (m *Mutes) IsMuted(chain string, proposalID string) bool {
 	return false
 }
 
-func (m *Mute) GetExpirationTime() string {
-	return m.Expires.Format(time.RFC822)
-}
-
 func (m *Mutes) AddMute(mute *Mute) {
 	m.Mutes = append(m.Mutes, mute)
 	m.Mutes = utils.Filter(m.Mutes, func(m *Mute) bool {

pkg/reporters/telegram/telegram.go

@@ -31,7 +31,8 @@ type Reporter struct {
 	Logger      zerolog.Logger
 	Templates   map[string]*template.Template
 
-	Version string
+	Version  string
+	Timezone *time.Location
 }
 
 const (
@@ -45,6 +46,7 @@ func NewTelegramReporter(
 	dataManager *data.Manager,
 	logger *zerolog.Logger,
 	version string,
+	timezone *time.Location,
 ) *Reporter {
 	return &Reporter{
 		TelegramToken:  config.TelegramToken,
@@ -55,6 +57,7 @@ func NewTelegramReporter(
 		Logger:         logger.With().Str("component", "telegram_reporter").Logger(),
 		Templates:      make(map[string]*template.Template, 0),
 		Version:        version,
+		Timezone:       timezone,
 	}
 }
 
@@ -104,6 +107,7 @@ func (reporter *Reporter) GetTemplate(tmlpType string) (*template.Template, erro
 
 	t, err := template.New(filename).Funcs(template.FuncMap{
 		"SerializeLink":  reporter.SerializeLink,
+		"SerializeDate":  reporter.SerializeDate,
 		"FormatDuration": utils.FormatDuration,
 	}).ParseFS(templates.TemplatesFs, "telegram/"+filename)
 	if err != nil {
@@ -251,3 +255,7 @@ func (reporter *Reporter) SerializeLink(link types.Link) template.HTML {
 
 	return template.HTML(link.Name)
 }
+
+func (reporter *Reporter) SerializeDate(date time.Time) string {
+	return date.In(reporter.Timezone).Format(time.RFC1123)
+}

pkg/types/config.go

@@ -1,6 +1,9 @@
 package types
 
-import "fmt"
+import (
+	"fmt"
+	"time"
+)
 
 type Config struct {
 	PagerDutyConfig PagerDutyConfig `toml:"pagerduty"`
@@ -9,6 +12,7 @@ type Config struct {
 	StatePath       string          `toml:"state-path"`
 	MutesPath       string          `toml:"mutes-path"`
 	Chains          Chains          `toml:"chains"`
+	Timezone        string          `toml:"timezone"`
 	Interval        string          `default:"* * * * *" toml:"interval"`
 }
 
@@ -33,5 +37,9 @@ func (c *Config) Validate() error {
 		}
 	}
 
+	if _, err := time.LoadLocation(c.Timezone); err != nil {
+		return fmt.Errorf("error parsing timezone: %s", err)
+	}
+
 	return nil
 }

pkg/types/config_test.go

@@ -123,10 +123,29 @@ func TestValidateConfigWrongProposalType(t *testing.T) {
 	require.Error(t, err, nil, "Error should be presented!")
 }
 
+func TestValidateConfigInvalidTimezone(t *testing.T) {
+	t.Parallel()
+
+	config := Config{
+		Timezone: "test",
+		Chains: []*Chain{
+			{
+				Name:          "chain",
+				LCDEndpoints:  []string{"endpoint"},
+				Wallets:       []*Wallet{{Address: "wallet"}},
+				ProposalsType: "v1",
+			},
+		},
+	}
+	err := config.Validate()
+	require.Error(t, err, nil, "Error should be presented!")
+}
+
 func TestValidateConfigValidChain(t *testing.T) {
 	t.Parallel()
 
 	config := Config{
+		Timezone: "Europe/Moscow",
 		Chains: []*Chain{
 			{
 				Name:          "chain",

pkg/types/types.go

@@ -32,10 +32,6 @@ func (p Proposal) GetTimeLeft() string {
 	return utils.FormatDuration(time.Until(p.EndTime).Round(time.Second))
 }
 
-func (p Proposal) GetProposalTime() string {
-	return p.EndTime.Format(time.RFC1123)
-}
-
 type TallyInfo struct {
 	Proposal Proposal
 	Tally    Tally

templates/telegram/mute_added.html

@@ -9,4 +9,4 @@
 {{- else }}
 <strong>Proposal ID:</strong> all proposals
 {{- end }}
-<strong>Expires: </strong>{{ .GetExpirationTime }}
+<strong>Expires: </strong>{{ SerializeDate .Expires }}

templates/telegram/mutes.html

@@ -12,5 +12,5 @@
 {{- else }}
 <strong>Proposal ID:</strong> all proposals
 {{- end }}
-<strong>Expires: </strong>{{ .GetExpirationTime }}
+<strong>Expires: </strong>{{ SerializeDate .Expires }}
 {{ end }}

templates/telegram/not_voted.html

@@ -2,7 +2,7 @@
 🔴 <strong> Wallet {{ SerializeLink $walletLink }} hasn't voted on proposal {{ .Proposal.ID }} on {{ .Chain.GetName }} </strong>
 {{ .Proposal.Title }}
 
-Voting ends at: {{ .Proposal.GetProposalTime }} (in {{ .Proposal.GetTimeLeft }})
+Voting ends at: {{ SerializeDate .Proposal.EndTime }} (in {{ .Proposal.GetTimeLeft }})
 
 {{ range .Chain.GetExplorerProposalsLinks .Proposal.ID }}{{ SerializeLink .}}
 {{ end }}

templates/telegram/revoted.html

@@ -4,7 +4,7 @@
 
 Vote: {{ .Vote.ResolveVote }}
 Old vote: {{ .OldVote.ResolveVote }}
-Voting ends at: {{ .Proposal.GetProposalTime }} (in {{ .Proposal.GetTimeLeft }})
+Voting ends at: {{ SerializeDate .Proposal.EndTime }} (in {{ .Proposal.GetTimeLeft }})
 
 {{ range .Chain.GetExplorerProposalsLinks .Proposal.ID }}{{ SerializeLink .}}
 {{ end }}

templates/telegram/voted.html

@@ -3,7 +3,7 @@
 {{ .Proposal.Title }}
 
 Vote: {{ .Vote.ResolveVote }}
-Voting ends at: {{ .Proposal.GetProposalTime }} (in {{ .Proposal.GetTimeLeft }})
+Voting ends at: {{ SerializeDate .Proposal.EndTime }} (in {{ .Proposal.GetTimeLeft }})
 
 {{ range .Chain.GetExplorerProposalsLinks .Proposal.ID }}{{ SerializeLink .}}
 {{ end }}