From 140b420652ec28b7226febb8ce13eed6380a097f Mon Sep 17 00:00:00 2001 From: shoopea Date: Mon, 10 Feb 2020 10:56:05 +0800 Subject: [PATCH] test user config --- bot.go | 11 +++++++++++ data/code_obj_sub_type.json | 5 +++++ rules.go | 10 ++++++++++ workers.go | 4 +++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/bot.go b/bot.go index 91c4fe2..b2f0664 100644 --- a/bot.go +++ b/bot.go @@ -891,6 +891,17 @@ func botCraftItem(m *ChatWarsMessage, r *regexp.Regexp) { return } +func botUserConfig(m *ChatWarsMessage) { + c := TGCommand{ + Type: commandReplyMsg, + Text: "Config:", + FromMsgID64: m.ID64, + FromChatID64: m.ChatID64, + } + TGCmdQueue <- c + return +} + func botCraftAll(m *ChatWarsMessage, r *regexp.Regexp) { clt, err := getLockedIdleClient() if err != nil { diff --git a/data/code_obj_sub_type.json b/data/code_obj_sub_type.json index 0831a2a..721b11c 100644 --- a/data/code_obj_sub_type.json +++ b/data/code_obj_sub_type.json @@ -654,6 +654,11 @@ "name": "Get Stock", "obj_type": "msg" }, + { + "intl_id": "msg_bot_user_config", + "name": "Get User Config in Bot", + "obj_type": "msg" + }, { "intl_id": "job_pillage", "name": "Pillage job", diff --git a/rules.go b/rules.go index 095b48f..19edddc 100644 --- a/rules.go +++ b/rules.go @@ -40,6 +40,16 @@ func resetMsgParsingRules() error { if c.Active { chats = append(chats, id) users = append(users, id) + + r = MessageParsingRule{ + Priority: 9999, + Description: "Config", + Rule: "^/config$", + MsgTypeID64: cacheObjSubType[`msg_bot_user_config`], + ChatID64: id, + SenderUserID64: id, + } + rules2 = append(rules2, r) } } muxClients.RUnlock() diff --git a/workers.go b/workers.go index 2d3acfc..36889ac 100644 --- a/workers.go +++ b/workers.go @@ -244,7 +244,7 @@ func MQKeepAliveWorker() { log.Printf("New client, reloading rules ..\n") resetMsgParsingRules() msgParsingRules, err = loadMsgParsingRules() - logOnError(err, "initCache : message parsing rules") + logOnError(err, "MQKeepAliveWorker : message parsing rules") } } } @@ -542,6 +542,8 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing cacheObjSubType[`msg_shop_main_ack`]") err = insertMsgShopMainAck(cwm) logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : insertMsgShopMainAck") + case cacheObjSubType[`msg_bot_user_config`]: + botUserConfig(m) default: //log.Printf("SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Unknwon message type in rule %d : %d (%d)\n%s\n", msgParsingRules[i].ID, msgParsingRules[i].MsgTypeID64, objId, m.Text) }