chtwrs/chirpnest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shoopea 2020-01-03 00:20:56 +08:00
parent 62e2698ea5
commit 6c525a0425
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/msg_rules.json
View File

@ -182,13 +182,13 @@
{ {
"prio": 5000, "prio": 5000,
"descn": "Stock Ack", "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" "msg_type": "msg_stock_ack"
}, },
{ {
"prio": "4000", "prio": "4000",
"descn": "Stock Ack", "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" "msg_type": "msg_stock_ack"
}, },
{ {

2
msg.go
View File

@ -130,7 +130,7 @@ func parseSubTypeMessageStockAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar
cwm := ChatWarsMessageStockAck{} cwm := ChatWarsMessageStockAck{}
items := []ChatWarsItems{} 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) { for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Items}"), -1) {
i := getObjItemID(``, l[1]) i := getObjItemID(``, l[1])
q, _ := strconv.ParseInt(l[2], 10, 64) q, _ := strconv.ParseInt(l[2], 10, 64)