diff --git a/main.go b/main.go index a1b41a4..8413e70 100644 --- a/main.go +++ b/main.go @@ -131,7 +131,7 @@ func main() { _, _ = addObjGuild(``, `No Guild`) } - resetMsgParsingRules2() + resetMsgParsingRules() msgParsingRules, err = loadMsgParsingRules() logOnError(err, "Message parsing rules") diff --git a/rules.go b/rules.go index f502e0d..476026e 100644 --- a/rules.go +++ b/rules.go @@ -6,11 +6,11 @@ import ( "strconv" ) -func resetMsgParsingRules2() error { +func resetMsgParsingRules() error { var rules, rules2 []MessageParsingRule b, err := Asset("data/msg_rules.json") - logOnError(err, "resetMsgParsingRules2 : load data/msg_rules.json") + logOnError(err, "resetMsgParsingRules : load data/msg_rules.json") if err != nil { return err } @@ -26,13 +26,13 @@ func resetMsgParsingRules2() error { } r2.MsgTypeID64, err = codeObjSubTypeId(r2.MsgType) - logOnError(err, "resetMsgParsingRules2 : codeObjSubTypeId("+r2.MsgType+")") + logOnError(err, "resetMsgParsingRules : codeObjSubTypeId("+r2.MsgType+")") if err != nil { return err } r2.re, err = regexp.Compile(r2.Rule) - logOnError(err, "resetMsgParsingRules2 : Compile("+r.Rule+")") + logOnError(err, "resetMsgParsingRules : Compile("+r.Rule+")") if err != nil { return err } @@ -41,14 +41,14 @@ func resetMsgParsingRules2() error { } _, err = db.Exec(`TRUNCATE TABLE msg_rules;`) - logOnError(err, "resetMsgParsingRules2 : truncate table msg_rules") + logOnError(err, "resetMsgParsingRules : truncate table msg_rules") if err != nil { return err } stmt, err := db.Prepare(`INSERT INTO msg_rules (prio, msg_type_id, descn, rule) VALUES (?, ?, ?, ?);`) - logOnError(err, "resetMsgParsingRules2 : prepare statement") + logOnError(err, "resetMsgParsingRules : prepare statement") if err != nil { return err } @@ -56,7 +56,7 @@ func resetMsgParsingRules2() error { for _, r2 := range rules2 { _, err = stmt.Exec(r2.Priority, r2.MsgTypeID64, r2.Description, r2.Rule) - logOnError(err, "resetMsgParsingRules2 : insert statement "+r2.Description) + logOnError(err, "resetMsgParsingRules : insert statement "+r2.Description) if err != nil { return err } @@ -66,400 +66,3 @@ func resetMsgParsingRules2() error { return nil } - -func resetMsgParsingRules() { - _, err := db.Exec(`TRUNCATE TABLE msg_rules;`) - failOnError(err, "resetMsgParsingRules : truncate table msg_rules") - - _, err = db.Exec(`INSERT INTO msg_rules (prio, msg_type_id, descn, rule) - VALUES (5000, ` + strconv.Itoa(objSubTypeMessageReportAck) + `, "Player war report", "^(?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P([A-Za-z0-9 ]*)) βš”:(?P[0-9]+)(?P\\((-|\\+)[0-9]+\\)){0,1} πŸ›‘:(?P[0-9]+) Lvl: (?P[0-9]+)\\n` + - `Your result on the battlefield:\\n` + - `(πŸ”₯Exp: (?P[0-9]+)){0,1}(\\n)*` + - `(πŸ’°Gold: (?P\\-{0,1}[0-9]+)){0,1}(\\n)*` + - `(πŸ“¦Stock: (?P\\-{0,1}[0-9]+)){0,1}(\\n)*` + - `(❀️Hp: (?P\\-[0-9]+)){0,1}(\\n)*` + - `((?P(πŸ”‹Stamina restored))){0,1}(\\n(?P(⚑Critical strike))){0,1}$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageAuctionAnnounce) + `, "Auction annouce", "^Lot #(?P[0-9]+) : (?P.*)\\n` + - `(Quality: (?P.*)\\n){0,1}` + - `(Condition: (?P.*)\\n){0,1}` + - `Seller: (?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1}\\n` + - `Current price: (?P[0-9]+) pouch\\(es\\)\\n` + - `Buyer: (None|(?P[πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])( ){0,1}(\\[(?P[A-Z0-9]{1,3})\\]){0,1}(?P.*){0,1})\\n` + - `End At: (?P.*)\\n` + - `Status: (?P.*)(\\n)` + - `*(?s:.*)") - ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeAck) + `, "Time", "^In Chat Wars world now\\n` + - `(?P