From 7aac758ac0af216acafd23de116600fc0c5ce10a Mon Sep 17 00:00:00 2001 From: shoopea Date: Thu, 6 Feb 2020 23:25:48 +0800 Subject: [PATCH] fixes for shops jobs --- bot.go | 2 +- client.go | 2 +- job.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bot.go b/bot.go index 55da461..549ee23 100644 --- a/bot.go +++ b/bot.go @@ -800,7 +800,7 @@ func botShops(m *ChatWarsMessage) { j2 := JobPayloadShopsSlave{ JobCallbackID64: jobID64, Status: 0, - Slaves: len(clts), + Slaves: int64(len(clts)), Shops: make([]string, 0), } for j, link := range cfg.Bot.Shops { diff --git a/client.go b/client.go index 20f63c3..108a8f5 100644 --- a/client.go +++ b/client.go @@ -152,7 +152,7 @@ func getLockedAllIdleClientID64() ([]int64, error) { for _, c := range clients { if c.GameIdle { ids = append(ids, c.TGUserID64) - clients[ids[id]].Mux.Lock() + clients[c.TGUserID64].Mux.Lock() } } muxClients.RUnlock() diff --git a/job.go b/job.go index 1ddb5af..17b3e36 100644 --- a/job.go +++ b/job.go @@ -2181,7 +2181,7 @@ func jobCheckVaultLimit(j Job) { func jobShops(j Job) { - err = setJobDone(j.ID64) + err := setJobDone(j.ID64) logOnError(err, "jobShops : setJobDone") return @@ -2189,7 +2189,7 @@ func jobShops(j Job) { func jobShopsSlave(j Job) { - err = setJobDone(j.ID64) + err := setJobDone(j.ID64) logOnError(err, "jobShopsSlave : setJobDone") return