diff --git a/bot.go b/bot.go index 954bbf5..9cbb3f4 100644 --- a/bot.go +++ b/bot.go @@ -721,11 +721,22 @@ func botCraftItem(m *ChatWarsMessage) { clt.Mux.Unlock() p := JobPayloadCraftItem{ - MsgID64: m.ID64, - ChatID64: m.ChatID64, - ObjItemID64: getCraftItemID(m.Text), - Status: 0, + MsgID64: m.ID64, + ChatID64: m.ChatID64, + Status: 0, } + p.ObjItemID64, err = getCraftItemID(m.Text) + if err != nil { + c := TGCommand{ + Type: commandReplyMsg, + Text: fmt.Sprintf("%s", err), + FromMsgID64: m.ID64, + FromChatID64: m.ChatID64, + } + TGCmdQueue <- c + return + } + b, _ := json.Marshal(p) t := time.Now().UTC().Add(1 * time.Second) _, err = createJob(cacheObjSubType[`job_craft_item`], objJobPriority, userID64, 0, t, b) diff --git a/item.go b/item.go index 80fdb1c..f6db435 100644 --- a/item.go +++ b/item.go @@ -242,7 +242,7 @@ func addObjItemCraftItem(objID64 int64, itemID64 int64, quantity int64) error { return nil } -func getCraftItemID(cmd string) (int64, error) { +func getCraftItemID(cmd string) int64, error) { muxObjItem.RLock() defer muxObjItem.RUnlock()