From f8049c25c245cb2a023a37b518bb17c72033ed6f Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Mon, 3 Feb 2020 12:14:02 +0800
Subject: [PATCH] update

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

diff --git a/data/msg_rules.json b/data/msg_rules.json
index 47e9074..c33e995 100644
--- a/data/msg_rules.json
+++ b/data/msg_rules.json
@@ -1866,7 +1866,7 @@
   {
     "prio": 5000,
     "descn": "Tributes stats ack",
-    "rule": "^([1-9]{2} [a-zA-Z]+ [0-9]{4} [0-9]{2}\\:[0-9]{2} - [a-zA-Z]+ x [0-9]+, [0-9]+🔥(\n){0,1})+$",
+    "rule": "^(Here is the list of recent villagers tribute\\:)(?P<Tributes>\\n([1-9]{2} [a-zA-Z]+ [0-9]{4} [0-9]{2}\\:[0-9]{2} - [a-zA-Z]+ x [0-9]+, [0-9]+🔥)+$",
     "msg_type": "msg_tributes_stats_req",
     "chat_id": 0,
     "user_id": 0
diff --git a/msg.go b/msg.go
index af784f5..339d441 100644
--- a/msg.go
+++ b/msg.go
@@ -278,12 +278,12 @@ func parseSubTypeMessageGStockAnyAck(m *ChatWarsMessage, r *regexp.Regexp) (*Cha
 func parseSubTypeMessageTributesStatsAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageTributesStatsAck, error) {
 	cwm := ChatWarsMessageTributesStatsAck{}
 	tribute := ChatWarsTribute{}
-	re := regexp.MustCompile(`((?P<Date>[1-9]{2} [a-zA-Z]+ [0-9]{4} [0-9]{2}:[0-9]{2}) - (?P<Item>[a-zA-Z]+) x (?P<Quantity>[0-9]+), (?P<Exp>[0-9]+)🔥(\n){0,1})`)
-	for _, l := range re.FindAllStringSubmatch(m.Text, -1) {
-		log.Printf("parseSubTypeMessageTributesStatsAck : Date : %s\n", r.ReplaceAllString(l[0], "${Date}"))
-		log.Printf("parseSubTypeMessageTributesStatsAck : Item : %s\n", r.ReplaceAllString(l[0], "${Item}"))
-		log.Printf("parseSubTypeMessageTributesStatsAck : Quantity : %s\n", r.ReplaceAllString(l[0], "${Quantity}"))
-		log.Printf("parseSubTypeMessageTributesStatsAck : Exp : %s\n", r.ReplaceAllString(l[0], "${Exp}"))
+	re := regexp.MustCompile(`(\n(?P<Date>[1-9]{2} [a-zA-Z]+ [0-9]{4} [0-9]{2}:[0-9]{2}) - (?P<Item>[a-zA-Z]+) x (?P<Quantity>[0-9]+), (?P<Exp>[0-9]+)🔥)`)
+	for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Tributes}"), -1) {
+		log.Printf("parseSubTypeMessageTributesStatsAck : Date : %s\n", re.ReplaceAllString(l[0], "${Date}"))
+		log.Printf("parseSubTypeMessageTributesStatsAck : Item : %s\n", re.ReplaceAllString(l[0], "${Item}"))
+		log.Printf("parseSubTypeMessageTributesStatsAck : Quantity : %s\n", re.ReplaceAllString(l[0], "${Quantity}"))
+		log.Printf("parseSubTypeMessageTributesStatsAck : Exp : %s\n", re.ReplaceAllString(l[0], "${Exp}"))
 		cwm.Tributes = append(cwm.Tributes, tribute)
 	}