From b6ddfc71946d818694207fd77cfa4ff3288fc127 Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 30 Aug 2019 11:07:37 +0800 Subject: [PATCH] update g deposit --- bot.go | 7 +++++++ msg.go | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bot.go b/bot.go index 7cb0019..159e4db 100644 --- a/bot.go +++ b/bot.go @@ -658,6 +658,13 @@ func botGDepositAll(m *tb.Message) { p.ResObjID64 = append(p.ResObjID64, getObjItemID(`23`, `Coke`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`24`, `Purified Powder`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`31`, `Rope`)) + + list := getSQLListID64(`select o.id from obj o where o.obj_sub_type_id = ` + strconv(objSubTypeItemRecipe) + `;`) + p.ResObjID64 = append(p.ResObjID64, list...) + + list = getSQLListID64(`select o.id from obj o where o.obj_sub_type_id = ` + strconv(objSubTypeItemPart) + `;`) + p.ResObjID64 = append(p.ResObjID64, list...) + /* p.ResObjID64 = append(p.ResObjID64, getObjItemID(`39`, `Stinky Sumac`)) p.ResObjID64 = append(p.ResObjID64, getObjItemID(`s01`, `📕Scroll of Rage`)) diff --git a/msg.go b/msg.go index 6d4286f..c2fb897 100644 --- a/msg.go +++ b/msg.go @@ -49,7 +49,9 @@ func parseSubTypeMessageGDepositAck(m *ChatWarsMessage, r *regexp.Regexp) (*Chat cwmreq, err := parseSubTypeMessageGDepositReq(msg, rule.re) logOnError(err, "parseSubTypeMessageGDepositAck : parseSubTypeMessageGDepositReq") if err == nil && cwmreq.ItemID64 == cwm.ItemID64 && cwmreq.Quantity == cwm.Quantity { - clientFwdCWMsg(msg.TGUserID64, m.ID64, m.ChatID64, cfg.Bot.Depositchat) + if m.Date.UTC().Before(msg.Date.UTC().Add(1 * time.Minute)) { + clientFwdCWMsg(msg.TGUserID64, m.ID64, m.ChatID64, cfg.Bot.Depositchat) + } gDepositForwardMsg[i] = gDepositForwardMsg[len(gDepositForwardMsg)-1] gDepositForwardMsg = gDepositForwardMsg[:len(gDepositForwardMsg)-1] break