From 8abb3bc2d2bbcacef4f4c50b3e7c8eb0fb3ab6a7 Mon Sep 17 00:00:00 2001 From: shoopea Date: Thu, 23 Jan 2020 14:09:07 +0800 Subject: [PATCH] update deposit all --- bot.go | 1 + job.go | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/bot.go b/bot.go index 9839407..ad896fd 100644 --- a/bot.go +++ b/bot.go @@ -880,6 +880,7 @@ func botGDepositAll(m *tb.Message) { } p.ResObjID64 = append(p.ResObjID64, getObjItemID(`03`, `Pelt`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`04`, `Bone`)) + p.ResObjID64 = append(p.ResObjID64, getObjItemID(`05`, `Coal`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`07`, `Powder`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`08`, `Iron Ore`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`09`, `Cloth`)) diff --git a/job.go b/job.go index 98cc47a..a2dc23a 100644 --- a/job.go +++ b/job.go @@ -1612,6 +1612,30 @@ func jobGWithdraw(j Job) { if err == nil { p.CleanupMsg = append(p.CleanupMsg, *m) } + + for _, req := range p.Items { + if req.Inspect { + p2 = JobPayloadMsgDel{ + MsgTypeID64: cacheObjSubType[`msg_g_inspect_req`], + Delay: (10 * time.Second), + ObjMsgID64: 0, + } + b2, _ = json.Marshal(p2) + createJobCallback(cacheObjSubType[`job_msg_del`], j.UserID64, p2.MsgTypeID64, b2, time.Minute) + + p.Inspecting = req.Code + b, _ := json.Marshal(p) + + id, err := createJob(cacheObjSubType[`job_gwithdraw`], objJobPriority, j.UserID64, 0, time.Unix(maxUnixTimestamp, 0).UTC(), b) + logOnError(err, "jobGWithdraw : createJob") + setJobCallback(id, int64(bot.Me.ID), cacheObjSubType[`msg_invalid_action`]) + setJobCallback(id, int64(bot.Me.ID), cacheObjSubType[`msg_inspect_ack`]) + clientSendCWMsg(j.UserID64, fmt.Sprintf("/g_inspect_%s", p.Inspecting)) + err = setJobDone(j.ID64) + logOnError(err, "jobGWithdraw : setJobDone") + return + } + } } else if id == cacheObjSubType[`msg_msg_job_gwithdraw_ack`] { m, err := getObjMsg(j.Trigger) logOnError(err, "jobGWithdraw : getObjMsg")