From ce20e31721cf2189938d56756e48f67e1d5de755 Mon Sep 17 00:00:00 2001 From: shoopea Date: Fri, 14 Jun 2019 14:04:50 +0800 Subject: [PATCH] test --- README.md | 1 + obj.go | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 536bc75..0474c0e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ ChirpNestBot +- [ ] Check for not launching concurrent msg rescan jobs - [ ] MQTGCmdWorker[2] : Publishing message.: Exception (504) Reason: "channel/connection is not open" (add check in MQKeepAliveWorker ?) - [ ] Make sure refresh message receives the message later (jobMsgRefresh) - [ ] Adjust /time clock for auctions/... (delay between cw and real time ?) diff --git a/obj.go b/obj.go index 29f0418..7bc4122 100644 --- a/obj.go +++ b/obj.go @@ -580,7 +580,7 @@ func addObjItem(code string, name string, itemTypeID64 int64, weight int) (int64 c.Name = name c.Weight = weight cacheObjItem.Store(code, *c) - cacheObjItem.Store(strings.ToUpper(name), *c) + cacheObjItem.Store(name, *c) return objId, nil } @@ -599,8 +599,8 @@ func getObjItemID(c string, n string) int64 { } func silentGetObjItemID(code string, name string) int64 { - c := strings.ToLower(code) - n := strings.ToUpper(name) + c := code + n := name if v, ok := cacheObjItem.Load(c); ok { i := v.(ChatWarsItem) return i.ObjID64 @@ -622,8 +622,7 @@ func silentGetObjItemID(code string, name string) int64 { if ok, _ := regexp.MatchString(`^(a|e|w)[0-9]+$`, i.Code); !ok { //only gear can be custom named return true } - s := strings.ToUpper(regexp.QuoteMeta(i.Name)) - m := fmt.Sprintf("^(%s.*|.*%s)$", s, s) + m := fmt.Sprintf("^(%s.*|.*%s)$", regexp.QuoteMeta(i.Name), regexp.QuoteMeta(i.Name)) if ok, _ := regexp.MatchString(m, n2); ok { return false } else { @@ -676,7 +675,7 @@ func loadObjItem() error { c.Name = name c.Weight = weight cacheObjItem.Store(intl_id, *c) - cacheObjItem.Store(strings.ToUpper(name), *c) + cacheObjItem.Store(name, *c) } return nil