From 6c525a0425ed9f822b7403eaf06b818981513c2e Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@simba>
Date: Fri, 3 Jan 2020 00:20:56 +0800
Subject: [PATCH] fix

---
 data/msg_rules.json | 4 ++--
 msg.go              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/msg_rules.json b/data/msg_rules.json
index 135f150..1650615 100644
--- a/data/msg_rules.json
+++ b/data/msg_rules.json
@@ -182,13 +182,13 @@
 	{
 		"prio": 5000,
 		"descn": "Stock Ack",
-		"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):(?P<Items>(\\n[^\\(]+ \\([0-9]+\\))*)$",
+		"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):(?P<Items>(\\n[a-zA-Z ❄️]+ \\([0-9]+\\))*)$",
 		"msg_type": "msg_stock_ack"
 	},
 	{
 		"prio": "4000",
 		"descn": "Stock Ack",
-		"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):\\nUse \\/sg_\\{code\\} to trade some amount of resource for .*💰\\/pcs\\n(?P<Items>(\\n\\/sg_[0-9]+ [^\\(]+ \\([0-9]+\\))*)$",
+		"rule": "^📦Storage \\((?P<Used>[0-9]+)\\/(?P<Available>[0-9]+)\\):\\nUse \\/sg_\\{code\\} to trade some amount of resource for .*💰\\/pcs\\n(?P<Items>(\\n\\/sg_[a-z0-9]+ [a-zA-Z ❄️]+ \\([0-9]+\\))*)$",
 		"msg_type": "msg_stock_ack"
 	},
 	{
diff --git a/msg.go b/msg.go
index ada89b2..fae2cdb 100644
--- a/msg.go
+++ b/msg.go
@@ -130,7 +130,7 @@ func parseSubTypeMessageStockAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar
 	cwm := ChatWarsMessageStockAck{}
 	items := []ChatWarsItems{}
 
-	re := regexp.MustCompile(`\n([^\(]+) \(([0-9]+)\)`)
+	re := regexp.MustCompile(`\n([a-zA-Z ❄️]+) \(([0-9]+)\)`)
 	for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Items}"), -1) {
 		i := getObjItemID(``, l[1])
 		q, _ := strconv.ParseInt(l[2], 10, 64)