diff --git a/data/code_obj_sub_type.json b/data/code_obj_sub_type.json index 8ad01e9..adea83b 100644 --- a/data/code_obj_sub_type.json +++ b/data/code_obj_sub_type.json @@ -94,6 +94,36 @@ "name": "Player guilds war report ack", "obj_type": "msg" }, + { + "intl_id": "msg_g_list_req", + "name": "Player guilds list request", + "obj_type": "msg" + }, + { + "intl_id": "msg_g_list_ack", + "name": "Player guilds list ack", + "obj_type": "msg" + }, + { + "intl_id": "msg_g_atklist_req", + "name": "Player guilds atklist request", + "obj_type": "msg" + }, + { + "intl_id": "msg_g_atklist_ack", + "name": "Player guilds atklist ack", + "obj_type": "msg" + }, + { + "intl_id": "msg_g_deflist_req", + "name": "Player guilds deflist request", + "obj_type": "msg" + }, + { + "intl_id": "msg_g_deflist_ack", + "name": "Player guilds deflist ack", + "obj_type": "msg" + }, { "intl_id": "msg_quest_res", "name": "Quest result", diff --git a/data/msg_rules.json b/data/msg_rules.json index 6b7d9e8..2617bae 100644 --- a/data/msg_rules.json +++ b/data/msg_rules.json @@ -119,6 +119,54 @@ "chat_id": 0, "user_id": 0 }, + { + "prio": 5000, + "descn": "Guild list members request", + "rule": "^/g_list$", + "msg_type": "msg_g_list_req", + "chat_id": 0, + "user_id": 0 + }, + { + "prio": 5000, + "descn": "Guild list members ack", + "rule": "^([πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])(.*)(\\n#[0-9]+ [βš’βš—οΈπŸ“¦πŸΉβš”οΈπŸ›‘]+[0-9]+ \\[.*\\] [a-zA-z0-9 ]+)+$", + "msg_type": "msg_g_list_ack", + "chat_id": 0, + "user_id": 0 + }, + { + "prio": 5000, + "descn": "Guild attack list request", + "rule": "^/g_atklist$", + "msg_type": "msg_g_atklist_req", + "chat_id": 0, + "user_id": 0 + }, + { + "prio": 5000, + "descn": "Guild attack list ack", + "rule": "^([πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])(.*) Attack Rating(\\n#[0-9]+ βš”[0-9]+ [a-zA-z0-9 ]+)+$", + "msg_type": "msg_g_atklist_ack", + "chat_id": 0, + "user_id": 0 + }, + { + "prio": 5000, + "descn": "Guild defense list request", + "rule": "^/g_deflist$", + "msg_type": "msg_g_deflist_req", + "chat_id": 0, + "user_id": 0 + }, + { + "prio": 5000, + "descn": "Guild defense list ack", + "rule": "^([πŸ‰πŸ¦…πŸΊπŸ¦ˆπŸ¦ŒπŸ₯”πŸŒ‘])(.*) Defence Rating(\\n#[0-9]+ πŸ›‘[0-9]+ [a-zA-z0-9 ]+)+$", + "msg_type": "msg_g_deflist_ack", + "chat_id": 0, + "user_id": 0 + }, { "prio": 5000, "descn": "Hero request", diff --git a/workers.go b/workers.go index f745aaa..40df335 100644 --- a/workers.go +++ b/workers.go @@ -590,6 +590,12 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { botVaultValOth(m) case cacheObjSubType[`msg_refresh_cmd`]: botRefreshMsg(m, rule.re) + case cacheObjSubType[`msg_g_list_req`]: + case cacheObjSubType[`msg_g_list_ack`]: + case cacheObjSubType[`msg_g_atklist_req`]: + case cacheObjSubType[`msg_g_atklist_ack`]: + case cacheObjSubType[`msg_g_deflist_req`]: + case cacheObjSubType[`msg_g_deflist_ack`]: 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) }