diff --git a/workers.go b/workers.go index b6e10e1..4047e97 100644 --- a/workers.go +++ b/workers.go @@ -79,10 +79,11 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { // War reports // r := regexp.MustCompile(`^(?P[.]{1})(?P(\[[A-Z]{3}\]){0,1})(?P(\[[A-Za-z0-9 ]*\]){1}) ⚔:(?P[0-9]+) ?:(?P[0-9]+) Lvl: (?P[0-9]+)(?s:.*)$`) // r := regexp.MustCompile(`^(?s:.*)$`) - r := regexp.MustCompile(`^(?P.)(?s:.*)$`) + r := regexp.MustCompile(`^(?P.)(?P(\[[A-Z]{3}\]){0,1})(?s:.*)$`) if r.FindStringSubmatch(m.Text) != nil { log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : War report identified (%d)\n", objId) log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Castle : %s (%d)\n", r.ReplaceAllString(m.Text, "${Castle}"), objId) + log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Guild : %s (%d)\n", r.ReplaceAllString(m.Text, "${Guild}"), objId) } else { log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Unknown message type (%d)\n", objId) }