From 3917f2e96cac5ee794084eae9af40538aea9b856 Mon Sep 17 00:00:00 2001 From: shoopea Date: Sat, 14 Dec 2019 13:24:20 +0800 Subject: [PATCH] update g stock --- bot.go | 2 +- job.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bot.go b/bot.go index 8fd4c25..f96d2fe 100644 --- a/bot.go +++ b/bot.go @@ -650,7 +650,7 @@ func botGStock(m *tb.Message) { } b, _ := json.Marshal(p) t := time.Now().UTC().Add(1 * time.Second) - _, err := createJob(objSubTypeJobGStock, objJobPriority, int64(m.Chat.ID), 0, t, b) + _, err := createJob(objSubTypeJobGStock, objJobPriority, cfg.Bot.Admin, 0, t, b) if err != nil { c := TGCommand{ diff --git a/job.go b/job.go index 8a86ba4..6ed42ea 100644 --- a/job.go +++ b/job.go @@ -717,7 +717,7 @@ func jobGStock(j Job) { case 0: // send /g_stock_res p.Progress = 1 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_res") case 1: // send /g_stock_alch @@ -731,7 +731,7 @@ func jobGStock(j Job) { } p.Progress = 2 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_alch") case 2: // send /g_stock_misc @@ -745,7 +745,7 @@ func jobGStock(j Job) { } p.Progress = 3 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_misc") case 3: // send /g_stock_rec @@ -759,7 +759,7 @@ func jobGStock(j Job) { } p.Progress = 4 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_rec") case 4: // send /g_stock_parts @@ -773,7 +773,7 @@ func jobGStock(j Job) { } p.Progress = 5 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_parts") case 5: // send /g_stock_other @@ -787,7 +787,7 @@ func jobGStock(j Job) { } p.Progress = 6 b, _ := json.Marshal(&p) - err = createJobCallback(objSubTypeJobGStock, cfg.Bot.Admin, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) + err = createJobCallback(objSubTypeJobGStock, j.UserID64, objSubTypeMessageGStockAnyAck, b, 1*time.Minute) logOnError(err, "jobGStock : createJobCallback") clientSendCWMsg(cfg.Bot.Admin, "/g_stock_other") case 6: // collate everything and reply