VLADIMIR/valera
VLADIMIR
/
valera
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases Activity

move stat to 23:00
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Владимир Фёдоров 2023-04-06 17:56:04 +07:00
parent 64345c9350
commit 4ceb63a307
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/valera/main.go
View File

@ -28,7 +28,7 @@ var (
) )
const ( const (
version = "v1.6.1" version = "v1.6.2"
) )
type Opts struct { type Opts struct {
@ -132,7 +132,7 @@ func run() {
return return
} }
for _, chatID := range chats { for _, chatID := range chats {
if err := sendStatToChat(bot, dataBase, chatID, "Напоминаю:\n- Cегодня больше не жрем!\n\n", true); err != nil { if err := sendStatToChat(bot, dataBase, chatID, "Напоминаю:\n- Cегодня больше не жрем!\n\n"); err != nil {
fmt.Println(err) fmt.Println(err)
w.Header().Add("Content-Type", "application/json") w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
@ -266,7 +266,7 @@ func run() {
case commands.Go: case commands.Go:
sendGoToChat(bot, dataBase, chatID) sendGoToChat(bot, dataBase, chatID)
case commands.Stat: case commands.Stat:
if err := sendStatToChat(bot, dataBase, chatID, "", false); err != nil { if err := sendStatToChat(bot, dataBase, chatID, ""); err != nil {
fmt.Println(err) fmt.Println(err)
continue continue
} }
@ -312,8 +312,8 @@ func sendGoToChat(bot *tgbot.BotAPI, dataBase *db.DB, chatID int64) {
} }
} }
func sendStatToChat(bot *tgbot.BotAPI, dataBase *db.DB, chatID int64, prefix string, cron bool) error { func sendStatToChat(bot *tgbot.BotAPI, dataBase *db.DB, chatID int64, prefix string) error {
stat, err := dataBase.GetStat(chatID, cron) stat, err := dataBase.GetStat(chatID)
if err != nil { if err != nil {
return err return err
} }

9
internal/db/db.go
View File

@ -126,7 +126,7 @@ func (db *DB) SetPause(chatID int64, duration time.Duration) error {
return err return err
} }
func (db *DB) GetStat(chatID int64, cron bool) (map[string]int, error) { func (db *DB) GetStat(chatID int64) (map[string]int, error) {
ctx := context.Background() ctx := context.Background()
if err := db.AddChat(chatID); err != nil { if err := db.AddChat(chatID); err != nil {
@ -135,12 +135,7 @@ func (db *DB) GetStat(chatID int64, cron bool) (map[string]int, error) {
loc, _ := time.LoadLocation("Asia/Novosibirsk") loc, _ := time.LoadLocation("Asia/Novosibirsk")
t := time.Now().In(loc) t := time.Now().In(loc)
if cron { t = time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, loc)
t = t.Add(-24 * time.Hour)
}
if !cron {
t = time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, loc)
}
res := map[string]int{} res := map[string]int{}