This commit is contained in:
shoopea 2020-02-09 16:22:48 +08:00
parent 37a73e0e91
commit 6a779804a0

12
msg.go
View File

@ -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(`((?P<Cry>Your battle cries were successful)|(You were outplayed by (?P<Outplayer>.*))|(?P<Stamina>🔋Stamina restored)|.+)`)
re := regexp.MustCompile(`(` +
`(?P<Cry>Your battle cries were successful)|` +
`(You were outplayed by (?P<Outplayer>.*))|` +
`(?P<Stamina>🔋Stamina restored)|` +
`(🏅Peacekeeping (?P<Peacekeeping>.*))|` +
`(🏅Enraged (?P<Enraged>.*))|` +
`.+)`)
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])
}