From 6a779804a0748fb0aa4daf85e409fd1c82fdc9e0 Mon Sep 17 00:00:00 2001 From: shoopea Date: Sun, 9 Feb 2020 16:22:48 +0800 Subject: [PATCH] test --- msg.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/msg.go b/msg.go index 7b9ca3c..6029d59 100644 --- a/msg.go +++ b/msg.go @@ -176,7 +176,13 @@ func parseSubTypeMessageStockAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar func parseSubTypeMessageReportAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageReportAck, error) { cwm := ChatWarsMessageReportAck{} // log.Printf("parseSubTypeMessageReport : Extra : %s\n", r.ReplaceAllString(m.Text, "${Extra}")) - re := regexp.MustCompile(`((?PYour battle cries were successful)|(You were outplayed by (?P.*))|(?P🔋Stamina restored)|.+)`) + re := regexp.MustCompile(`(` + + `(?PYour battle cries were successful)|` + + `(You were outplayed by (?P.*))|` + + `(?P🔋Stamina restored)|` + + `(🏅Peacekeeping (?P.*))|` + + `(🏅Enraged (?P.*))|` + + `.+)`) for i, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Extra}"), -1) { if len(re.ReplaceAllString(l[0], "${Cry}")) != 0 { // log.Printf("parseSubTypeMessageReport : Extra[%d] : Cry\n", i) @@ -184,6 +190,10 @@ func parseSubTypeMessageReportAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa // log.Printf("parseSubTypeMessageReport : Extra[%d] : Outplayer\n", i) } else if len(re.ReplaceAllString(l[0], "${Stamina}")) != 0 { // log.Printf("parseSubTypeMessageReport : Extra[%d] : Stamina\n", i) + } else if len(re.ReplaceAllString(l[0], "${Peacekeeping}")) != 0 { + // log.Printf("parseSubTypeMessageReport : Extra[%d] : Peacekeeping\n", i) + } else if len(re.ReplaceAllString(l[0], "${Enraged}")) != 0 { + // log.Printf("parseSubTypeMessageReport : Extra[%d] : Enraged\n", i) } else { log.Printf("parseSubTypeMessageReport : Extra[%d] : %s\n", i, l[0]) }