From 945520ef36d73b061d425b07357256ddafc33f4b Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sun, 26 May 2019 00:07:20 +0800
Subject: [PATCH] test

---
 rules.go | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/rules.go b/rules.go
index 16c9600..d9d0e30 100644
--- a/rules.go
+++ b/rules.go
@@ -115,16 +115,9 @@ 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", "^(🏠Trade union news:){0,1}(\\n)*` +
-		`(?P<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}` +
-		`(?P<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)*$")
+								,(5000, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war rep with both", "^(🏠Trade union news:\n)(?P<Union>(?s:.*))(🎪State of exclusive rights:\n)(?P<Fair>(?s:.*))$")
+								,(4900, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war rep only union", "^(🏠Trade union news:\n)(?P<Union>(?s:.*))(🎪State of exclusive rights:\n){0}(?P<Fair>(?s:.*))$")
+								,(4900, ` + strconv.Itoa(objSubTypeMessageUnionWar) + `, "Union war rep only fair", "^(🏠Trade union news:\n){0}(?P<Union>(?s:.*))(🎪State of exclusive rights:\n)(?P<Fair>(?s:.*))$")
 		;`)
 	failOnError(err, "resetMsgParsingRules : populate table msg_rules")
 }