diff --git a/cron.go b/cron.go index b72a731..8990e21 100644 --- a/cron.go +++ b/cron.go @@ -62,7 +62,7 @@ func cronGetHammerTime() { return } clt.Mux.Unlock() - p := JobPayloadGetHammertime{} + p := JobPayloadGetHammerTime{} b, _ := json.Marshal(&p) err = createJobCallback(objSubTypeJobGetHammerTime, clt.TGUserID64, objSubTypeMessageTimeAck, b, 1*time.Minute) logOnError(err, "cronGetHammerTime : createJobCallback") diff --git a/msg.go b/msg.go index 7a54af9..f6bc0dc 100644 --- a/msg.go +++ b/msg.go @@ -436,7 +436,7 @@ func parseSubTypeMessageTimeAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWars cwm.Hour, _ = strconv.ParseInt(r.ReplaceAllString(m.Text, "${Hour}"), 10, 64) cwm.Minute, _ = strconv.ParseInt(r.ReplaceAllString(m.Text, "${Minute}"), 10, 64) cwm.Day, _ = strconv.ParseInt(r.ReplaceAllString(m.Text, "${Day}"), 10, 64) - cwm.Month = int64(chatWarsMonth[r.ReplaceAllString(d, "${Month}")]) + cwm.Month = int64(chatWarsMonth[r.ReplaceAllString(m.Text, "${Month}")]) cwm.Year, _ = strconv.ParseInt(r.ReplaceAllString(m.Text, "${Year}"), 10, 64) cwm.Weather = r.ReplaceAllString(m.Text, "${Weather}") cwm.WeatherNext = r.ReplaceAllString(m.Text, "${WeatherNext}")