From 79f23ccf4cfd64b0b1aec9dfc0139cbb05d7b2a4 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Tue, 27 Aug 2019 12:40:12 +0800
Subject: [PATCH] update deposit all

---
 job.go     | 19 ++++++++++++++-----
 workers.go |  3 +--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/job.go b/job.go
index bd29a76..fee66b4 100644
--- a/job.go
+++ b/job.go
@@ -763,36 +763,42 @@ func jobGDeposit(j Job) {
 			}
 		}
 
-		if res || alch || misc || craft || equip {
-			p.Status = 1
-			b, _ = json.Marshal(&p)
-		}
 		if res {
 			clientSendCWMsgDelay(p.ChatID64, `📦Resources`, delay)
-			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageOrderbookAck, b, delay)
+			p.Status = objSubTypeMessageStockAck
+			b, _ = json.Marshal(&p)
+			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageStockAck, b, delay)
 			logOnError(err, "jobGDeposit : createJobCallback")
 			delay = delay + 2*time.Second
 		}
 		if alch {
 			clientSendCWMsgDelay(p.ChatID64, `⚗️Alchemy`, delay)
+			p.Status = 1
+			b, _ = json.Marshal(&p)
 			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageOrderbookAck, b, delay)
 			logOnError(err, "jobGDeposit : createJobCallback")
 			delay = delay + 2*time.Second
 		}
 		if misc {
 			clientSendCWMsgDelay(p.ChatID64, `🗃Misc`, delay)
+			p.Status = 1
+			b, _ = json.Marshal(&p)
 			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageOrderbookAck, b, delay)
 			logOnError(err, "jobGDeposit : createJobCallback")
 			delay = delay + 2*time.Second
 		}
 		if craft {
 			clientSendCWMsgDelay(p.ChatID64, `⚒Crafting`, delay)
+			p.Status = 1
+			b, _ = json.Marshal(&p)
 			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageOrderbookAck, b, delay)
 			logOnError(err, "jobGDeposit : createJobCallback")
 			delay = delay + 2*time.Second
 		}
 		if equip {
 			clientSendCWMsgDelay(p.ChatID64, `🏷Equipment`, delay)
+			p.Status = 1
+			b, _ = json.Marshal(&p)
 			err = createJobCallback(objSubTypeJobGDeposit, j.UserID64, objSubTypeMessageOrderbookAck, b, delay)
 			logOnError(err, "jobGDeposit : createJobCallback")
 			delay = delay + 2*time.Second
@@ -800,7 +806,10 @@ func jobGDeposit(j Job) {
 
 		return
 	} else if p.Status == 1 { /* handle that one resource from the objSubTypeMessageOrderbookAck msg */
+		log.Printf("jobGDeposit : objSubTypeMessageStockAck : %d\n.", j.Trigger)
 
+	} else if p.Status == objSubTypeMessageStockAck {
+		log.Printf("jobGDeposit : objSubTypeMessageStockAck : %d\n.", j.Trigger)
 	}
 
 	err = setJobDone(j.ID64)
diff --git a/workers.go b/workers.go
index 40a69e2..b6e8fb2 100644
--- a/workers.go
+++ b/workers.go
@@ -324,7 +324,6 @@ func SQLCWMsgWorker(id int, msgs <-chan ChatWarsMessage, objIds chan<- int64) {
 }
 
 func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
-	var i int
 	//log.Printf("SQLIdentifyMsgWorker[" + strconv.Itoa(id) + "] : Starting.")
 	for objId := range objIds {
 		m, err := getObjMsg(objId)
@@ -466,7 +465,7 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 					_, err := parseSubTypeMessageStockAck(m, rule.re)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageStockAck.")
 				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].MsgTypeID, objId, m.Text)
 				}
 				muxCallbacks.Lock()
 				if mc1, mok1 := callbacks[m.TGUserID64]; mok1 {