From 333517dfba29c0bb35446edf6f9bf697011b4d56 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sat, 25 May 2019 23:42:47 +0800
Subject: [PATCH] test

---
 rules.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/rules.go b/rules.go
index a853175..6ebc236 100644
--- a/rules.go
+++ b/rules.go
@@ -115,14 +115,16 @@ func resetMsgParsingRules() {
 		`(🎖Attack leaders: ([🐉🦅🐺🦈🦌🥔🌑])([^,]+)(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}){0,1}(\\n){0,1}` +
 		`(🎖Defense leaders: ([🐉🦅🐺🦈🦌🥔🌑])([^,]+)(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}(,([🐉🦅🐺🦈🦌🥔🌑])([^,]+)){0,1}){0,1}(\\n){0,1})(\\n)*)*` +
 		`$")
-								,(5000, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war report with trade union", "^(\\x{1F3E0}Trade union news:){0,1}(\\n)*` +
-		`((([A-Z][a-z]+ [A-Z][a-z]+) was ((easily defended|defended successfully|breached.|easily breached.|closely breached.))( Attackers have pillaged union for ([0-9]+) stock){0,1}:\\n` +
-		`((.+)(\\n)){0,1}` +
-		`((.+)(\\n)){0,1}` +
-		`)(\\n)*)+` +
-		`(\\x{1F3AA}State of exclusive rights:\\n){0,1}` +
-		`(?s:.*)` +
-		`$")
+								,(5000, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war report with trade union", "^(🏠Trade union news:){0,1}(\\n)*` +
+		`(?<Union>((([A-Z][a-z]+ [A-Z][a-z]+) was ((easily defended|defended successfully|breached.|easily breached.|closely breached.))( Attackers have pillaged union for ([0-9]+) stock){0,1}:\\n` +
+		`((.Attack+)(\\n)){0,1}` +
+		`((.Defense+)(\\n)){0,1}` +
+		`)(\\n)*)+)` +
+		`(🎪State of exclusive rights:\\n){0,1}` +
+		`(?<Fair>((([A-Z][a-z]+ [A-Z][a-z]+) ((was protected)|(belongs to [A-Z][a-z]+ [A-Z][a-z]+:)\\n` +
+		`((.Attack+)(\\n)){0,1}` +
+		`((.Defense+)(\\n)){0,1}` +
+		`)(\\n)*)+)(\\n)*$")
 		;`)
 	failOnError(err, "resetMsgParsingRules : populate table msg_rules")
 }