diff --git a/client.go b/client.go index df66355..ea3fa67 100644 --- a/client.go +++ b/client.go @@ -134,19 +134,27 @@ func clientFwdCWMsg(userID64 int64, fromMsgID64 int64, fromChatID64 int64, toCha } +func clientSendTGMsgDelay(userID64 int64, chatID64 int64, s string, d time.Duration) { + c := TGCommand{ + Type: commandSendMsg, + Text: s, + FromUserID64: userID64, + ToChatID64: chatID64, + Delay: d, + } + MQTGCmdQueue <- c +} + +func clientSendTGMsg(userID64 int64, chatID64 int64, s string) { + clientSendCWMsgDelay(userID64, chatID64, s, 0) +} + func clientSendCWMsg(userID64 int64, s string) { clientSendCWMsgDelay(userID64, s, 0) } func clientSendCWMsgDelay(userID64 int64, s string, d time.Duration) { - c := TGCommand{ - Type: commandSendMsg, - Text: s, - FromUserID64: userID64, - ToChatID64: userID64ChtWrsBot, - Delay: d, - } - MQTGCmdQueue <- c + clientSendTGMsgDelay(userID64, userID64ChtWrsBot, s, d) } func clientRefreshCWMsg(userID64 int64, chatID64 int64, msgID64 int64) { diff --git a/data/code_obj_sub_type.json b/data/code_obj_sub_type.json index 1355249..744ee5b 100644 --- a/data/code_obj_sub_type.json +++ b/data/code_obj_sub_type.json @@ -519,6 +519,16 @@ "name": "Level Up Ack", "obj_type": "msg" }, + { + "intl_id": "msg_ny2020_max_capacity", + "name": "NY 2020 Event Tile to max capacity", + "obj_type": "msg" + }, + { + "intl_id": "msg_ny2020_user_tile_set", + "name": "NY 2020 Event Tile Set for User", + "obj_type": "msg" + }, { "intl_id": "job_pillage", "name": "Pillage job", diff --git a/data/msg_rules.json b/data/msg_rules.json index 2e948ac..a65e19c 100644 --- a/data/msg_rules.json +++ b/data/msg_rules.json @@ -1742,5 +1742,21 @@ "msg_type": "msg_level_up_ack", "chat_id": 0, "user_id": 0 + }, + { + "prio": 5000, + "descn": "NY2020 Event Max capacity", + "rule": "^Tile Already At Its Max Capacity, (?P.*)$", + "msg_type": "msg_ny2020_max_capacity", + "chat_id": -1001198527605, + "user_id": 841616455 + }, + { + "prio": 5000, + "descn": "NY2020 Event User Tile", + "rule": "^(?P.*) is now at (?P[a-z][0-9])$", + "msg_type": "msg_ny2020_user_tile_set", + "chat_id": -1001198527605, + "user_id": 841616455 } ] \ No newline at end of file