From 427afd4340603f8115fcaec8bc8b79d4ff0ddce2 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Sun, 6 Aug 2023 13:40:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D1=91=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 5 +++-- modules/ssau_parser/database.go | 4 ++-- modules/tg/bot.go | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 17cd2f4..783ee88 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "log" "os" + "time" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/ssau_parser" @@ -32,9 +33,9 @@ func main() { if err != nil { log.Fatal(err) } - + now, _ := time.Parse("2006-01-02 15:04 -07", "2023-03-06 11:20 +04") for update := range *bot.Updates { - _, err := bot.HandleUpdate(update) + _, err := bot.HandleUpdate(update, now) if err != nil { log.Println(err) } diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index 23bf045..c8723c5 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -46,7 +46,7 @@ func UpdateSchedule(db *xorm.Engine, sh WeekShedule) ([]database.Lesson, []datab return nil, nil, err } gr.LastUpd = time.Now() - if _, err := db.Update(gr); err != nil { + if _, err := db.ID(gr.GroupId).Update(gr); err != nil { return nil, nil, err } } else { @@ -55,7 +55,7 @@ func UpdateSchedule(db *xorm.Engine, sh WeekShedule) ([]database.Lesson, []datab return nil, nil, err } t.LastUpd = time.Now() - if _, err := db.Update(t); err != nil { + if _, err := db.ID(t.TeacherId).Update(t); err != nil { return nil, nil, err } } diff --git a/modules/tg/bot.go b/modules/tg/bot.go index 33264d7..5dfbad3 100644 --- a/modules/tg/bot.go +++ b/modules/tg/bot.go @@ -129,7 +129,10 @@ func (bot *Bot) HandleUpdate(update tgbotapi.Update, now ...time.Time) (tgbotapi case database.NotStarted: err = bot.Start(user) case database.Ready: - return bot.Find(msg.Time(), user, msg.Text) + if len(now) == 0 { + now[0] = msg.Time() + } + return bot.Find(now[0], user, msg.Text) default: return bot.Etc(user) }