From 60efc6105bf2ead9fe3f2985488a179c383ee7ef Mon Sep 17 00:00:00 2001 From: shoopea Date: Sun, 29 Dec 2019 16:42:31 +0800 Subject: [PATCH] fix --- def.go | 2 +- workers.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/def.go b/def.go index 8f07703..1658eca 100644 --- a/def.go +++ b/def.go @@ -87,7 +87,7 @@ type ChatWarsItem struct { Code string `json:"code"` Name string `json:"name"` Weight int64 `json:"weight"` - Exchange string `json:"exchange"` + Exchange bool `json:"exchange"` Auction bool `json:"auction"` Craft ChatWarsItemCraft `json:"craft"` } diff --git a/workers.go b/workers.go index 6cd00bd..181eb9c 100644 --- a/workers.go +++ b/workers.go @@ -335,9 +335,9 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { //logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : msgRegex.") log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Message unidentified (%d)\n%s\n", objId, m.Text) } else { - err = setObjSubTypeId(objId, rule.MsgTypeID) + err = setObjSubTypeId(objId, rule.MsgTypeID64) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId") - switch rule.MsgTypeID { + switch rule.MsgTypeID64 { case objSubTypeMessageGRolesReq: case objSubTypeMessageGo: case objSubTypeMessageReportReq: @@ -499,16 +499,16 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { _, err := parseSubTypeMessageQuestResult(m, rule.re) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageQuestResult.") default: - //log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Unknwon message type in rule %d : %d (%d)\n%s\n", msgParsingRules[i].ID, msgParsingRules[i].MsgTypeID, objId, m.Text) + //log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Unknwon message type in rule %d : %d (%d)\n%s\n", msgParsingRules[i].ID, msgParsingRules[i].MsgTypeID64, objId, m.Text) } muxCallbacks.Lock() if mc1, mok1 := callbacks[m.TGUserID64]; mok1 { - if mc2, mok2 := mc1[rule.MsgTypeID]; mok2 { + if mc2, mok2 := mc1[rule.MsgTypeID64]; mok2 { for j := range mc2 { err := rescheduleJob(mc2[j], m.ObjID64, time.Now().UTC()) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : callbacks triggering") } - mc1[rule.MsgTypeID] = nil + mc1[rule.MsgTypeID64] = nil } } muxCallbacks.Unlock()