From f531a28053db1492400b5a691437c1e7887c143b Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Mon, 29 Jun 2020 12:47:19 +0200
Subject: [PATCH] update stash

---
 def.go |  2 +-
 job.go | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/def.go b/def.go
index 515a7ba..12c243b 100644
--- a/def.go
+++ b/def.go
@@ -641,7 +641,7 @@ type JobPayloadGetStash struct {
 	UserID64    int64             `json:"user_id"`
 	ClientID64  []int64           `json:"clients_id"`
 	ClientCount int64             `json:"client_count"`
-	Stock       []ChatWarsItems   `json:"stock"`
+	Stash       map[int64]int64   `json:"stock"`
 	CleanupMsg  []ChatWarsMessage `json:"cleanup_msg"`
 }
 
diff --git a/job.go b/job.go
index 0a03cab..30d3c15 100644
--- a/job.go
+++ b/job.go
@@ -2110,6 +2110,13 @@ func jobGetStash(j Job) {
 						break
 					}
 				}
+				cwm, err := parseSubTypeMessageExchangeAck(m, rule)
+				logOnError(err, "jobGetStash : parseSubTypeMessageExchangeAck")
+				if err == nil {
+					for _, d := range cwm.DealList {
+						p.Stash[d.ItemID64] += d.Quantity
+					}
+				}
 				fmt.Printf("jobGetStash : %d clients remaining\n", len(p.ClientID64))
 				fmt.Printf("jobGetStash : clearing trigger for next client\n")
 				j.Trigger = 0
@@ -2161,13 +2168,19 @@ func jobGetStash(j Job) {
 	if len(p.ClientID64) == 0 && j.Trigger == 0 {
 		fmt.Printf("jobGetStash : Cleaning up\n")
 		for _, m := range p.CleanupMsg {
+			fmt.Printf("jobGetStash : clientDelTGMsg(%d, %d, %d)\n", m.TGUserID64, m.ID64, m.ChatID64)
 			clientDelTGMsg(m.TGUserID64, m.ID64, m.ChatID64)
 		}
 	}
 
+	out = "Stash:\n"
+	for k, v := range p.Stash {
+		out = fmt.Sprintf(" %d : %d\n", k, v)
+	}
+
 	c := TGCommand{
 		Type:         commandReplyMsg,
-		Text:         "Done.",
+		Text:         out,
 		FromMsgID64:  p.MsgID64,
 		FromChatID64: p.ChatID64,
 		ParseMode:    cmdParseModeHTML,