From 08e079da60a5e83e75ab4b8e9bdfd7167f6a5d61 Mon Sep 17 00:00:00 2001 From: shoopea Date: Mon, 3 Feb 2020 14:20:57 +0800 Subject: [PATCH] test --- msg.go | 14 ++++++++------ sql.go | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/msg.go b/msg.go index a088fd4..65ed216 100644 --- a/msg.go +++ b/msg.go @@ -278,14 +278,16 @@ func parseSubTypeMessageGStockAnyAck(m *ChatWarsMessage, r *regexp.Regexp) (*Cha func parseSubTypeMessageTributesStatsAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWarsMessageTributesStatsAck, error) { cwm := ChatWarsMessageTributesStatsAck{} tribute := ChatWarsTribute{} - log.Printf("parseSubTypeMessageTributesStatsAck : tributes :\n%s\n", r.ReplaceAllString(m.Text, "${Tributes}")) re := regexp.MustCompile(`(\n(?P[1-9]{2} [a-zA-Z]+ [0-9]{4} [0-9]{2}:[0-9]{2}) - (?P[a-zA-Z]+) x (?P[0-9]+), (?P[0-9]+)🔥)`) for _, l := range re.FindAllStringSubmatch(r.ReplaceAllString(m.Text, "${Tributes}"), -1) { - log.Printf("parseSubTypeMessageTributesStatsAck : Date : %s\n", re.ReplaceAllString(l[0], "${Date}")) - log.Printf("parseSubTypeMessageTributesStatsAck : Item : %s\n", re.ReplaceAllString(l[0], "${Item}")) - log.Printf("parseSubTypeMessageTributesStatsAck : Quantity : %s\n", re.ReplaceAllString(l[0], "${Quantity}")) - log.Printf("parseSubTypeMessageTributesStatsAck : Exp : %s\n", re.ReplaceAllString(l[0], "${Exp}")) - tribute.Date, err = fromChatWarsDate(re.ReplaceAllString(l[0], "${Date}")) + /* + log.Printf("parseSubTypeMessageTributesStatsAck : Date : %s\n", re.ReplaceAllString(l[0], "${Date}")) + log.Printf("parseSubTypeMessageTributesStatsAck : Item : %s\n", re.ReplaceAllString(l[0], "${Item}")) + log.Printf("parseSubTypeMessageTributesStatsAck : Quantity : %s\n", re.ReplaceAllString(l[0], "${Quantity}")) + log.Printf("parseSubTypeMessageTributesStatsAck : Exp : %s\n", re.ReplaceAllString(l[0], "${Exp}")) + */ + d, err := fromChatWarsDate(re.ReplaceAllString(l[0], "${Date}")) + tribute.Date = d logOnError(err, "parseSubTypeMessageTributesStatsAck : fromChatWarsDate") tribute.ItemID64 = getSilentObjItemID(``, re.ReplaceAllString(l[0], "${Item}")) tribute.Quantity, _ = strconv.ParseInt(r.ReplaceAllString(l[0], "${Quantity}"), 10, 64) diff --git a/sql.go b/sql.go index 8932cf3..14e3be6 100644 --- a/sql.go +++ b/sql.go @@ -658,7 +658,7 @@ func insertMsgTributesStats(m *ChatWarsMessageTributesStatsAck) error { defer stmt.Close() for _, t := range m.Tributes { - _, err = stmt.Exec(m.Msg.TGUserID64, t.ItemID64, t.Quantity, t.Exp, t.Date) + _, err := stmt.Exec(m.Msg.TGUserID64, t.ItemID64, t.Quantity, t.Exp, t.Date) logOnError(err, "insertMsgTributesStats Exec") }