diff --git a/def.go b/def.go index 8c79859..5b389c3 100644 --- a/def.go +++ b/def.go @@ -396,38 +396,36 @@ const ( objSubTypeMessageWithdrawReq = 340 // /g_withdraw (done) objSubTypeMessageWithdrawCode = 341 // code to receive (done) objSubTypeMessageWithdrawRcv = 342 // Withdraw "received" msg (done) - objSubTypeMessageDepositReq = 343 // /g_deposit (done) - objSubTypeMessageDepositAck = 344 // Deposited successfully (done) - objSubTypeMessageStockReq = 345 // /stock (done) - objSubTypeMessageStockAck = 346 // result from /stock (not done) - objSubTypeMessageMiscReq = 347 // /misc (done) - objSubTypeMessageMiscAck = 348 // result from /misc (not done) - objSubTypeMessageUnionWar = 349 // from Chat Wars Reports (not done) - objSubTypeMessageTUReportReq = 350 // /tu_report (not done) - objSubTypeMessageTUReportAck = 351 // result from /tu_report (not done) - objSubTypeMessageTimeout = 352 // generic timeout for action - objSubTypeMessageGoQuestAck = 353 // confirm quest destination/busyness (done) - objSubTypeMessageGRolesReq = 354 // /g_roles (done) - objSubTypeMessageGRolesAck = 355 // result from /g_roles (done) - objSubTypeMessageGStockResReq = 356 // /g_stock_res (done) - objSubTypeMessageGStockAlchReq = 357 // /g_stock_alch (done) - objSubTypeMessageGStockMiscReq = 358 // /g_stock_misc (done) - objSubTypeMessageGStockRecReq = 359 // /g_stock_rec (done) - objSubTypeMessageGStockPartReq = 360 // /g_stock_parts (done) - objSubTypeMessageGStockOthReq = 361 // /g_stock_other (done) - objSubTypeMessageGStockAnyAck = 362 // result from any /g_stock_xxx (done) - objSubTypeMessageGStockReq = 363 // /g_stock (done) - objSubTypeMessageGStockAck = 364 // result from /g_stock (done) - objSubTypeMessageBusy = 365 // too busy now - objSubTypeMessageResStockReq = 366 // 📦Resources or /stock (done) - objSubTypeMessageAlchStockReq = 367 // ⚗️Alchemy (done) - objSubTypeMessageMiscStockReq = 368 // 🗃Misc or /misc (done) - objSubTypeMessageEquipStockReq = 369 // 🏷Equipment (done) - objSubTypeMessageCraftStockReq = 370 // ⚒Crafting (done) - objSubTypeMessageStockEmpty = 371 // [empty] (done) - objSubTypeMessageStockAnyAck = 372 // list of stock (done) - objSubTypeMessageGDepositReq = 373 // /g_deposit xx y (done) - objSubTypeMessageGDepositAck = 374 // Deposited successfully: xx (y) (done) + objSubTypeMessageStockReq = 343 // /stock (done) + objSubTypeMessageStockAck = 344 // result from /stock (not done) + objSubTypeMessageMiscReq = 345 // /misc (done) + objSubTypeMessageMiscAck = 346 // result from /misc (not done) + objSubTypeMessageUnionWar = 347 // from Chat Wars Reports (not done) + objSubTypeMessageTUReportReq = 348 // /tu_report (not done) + objSubTypeMessageTUReportAck = 349 // result from /tu_report (not done) + objSubTypeMessageTimeout = 350 // generic timeout for action + objSubTypeMessageGoQuestAck = 351 // confirm quest destination/busyness (done) + objSubTypeMessageGRolesReq = 352 // /g_roles (done) + objSubTypeMessageGRolesAck = 353 // result from /g_roles (done) + objSubTypeMessageGStockResReq = 354 // /g_stock_res (done) + objSubTypeMessageGStockAlchReq = 355 // /g_stock_alch (done) + objSubTypeMessageGStockMiscReq = 356 // /g_stock_misc (done) + objSubTypeMessageGStockRecReq = 357 // /g_stock_rec (done) + objSubTypeMessageGStockPartReq = 358 // /g_stock_parts (done) + objSubTypeMessageGStockOthReq = 359 // /g_stock_other (done) + objSubTypeMessageGStockAnyAck = 360 // result from any /g_stock_xxx (done) + objSubTypeMessageGStockReq = 361 // /g_stock (done) + objSubTypeMessageGStockAck = 362 // result from /g_stock (done) + objSubTypeMessageBusy = 363 // too busy now + objSubTypeMessageResStockReq = 364 // 📦Resources or /stock (done) + objSubTypeMessageAlchStockReq = 365 // ⚗️Alchemy (done) + objSubTypeMessageMiscStockReq = 366 // 🗃Misc or /misc (done) + objSubTypeMessageEquipStockReq = 367 // 🏷Equipment (done) + objSubTypeMessageCraftStockReq = 368 // ⚒Crafting (done) + objSubTypeMessageStockEmpty = 369 // [empty] (done) + objSubTypeMessageStockAnyAck = 370 // list of stock (done) + objSubTypeMessageGDepositReq = 371 // /g_deposit xx y (done) + objSubTypeMessageGDepositAck = 372 // Deposited successfully: xx (y) (done) objSubTypeJobPillage = 601 objSubTypeJobTribute = 602 objSubTypeJobStatus = 603 diff --git a/rules.go b/rules.go index 093a628..a46c605 100644 --- a/rules.go +++ b/rules.go @@ -117,9 +117,6 @@ func resetMsgParsingRules() { `(\\n(?P.*) x (?P.*)){0,1}` + `(\\n(?P.*) x (?P.*)){0,1}` + `(\\n(?P.*) x (?P.*)){0,1}$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "Deposit Req", "^/g_deposit (?P[a-z0-9]+) (?P[0-9]+)$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #2", "^Deposited successfully: (?P.*) \\((?P[0-9]+)\\)$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "Deposit Ack #1", "^Deposited (?P.*) \\((?P[0-9]+)\\) successfully$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockReq) + `, "Stock Req", "^/stock$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAck) + `, "Stock Ack", "^📦Storage \\((?P[0-9]+)\\/(?P[0-9]+)\\):` + `(?P(\\n[a-zA-Z ]+ \\([0-9]+\\))*)$") @@ -204,8 +201,9 @@ func resetMsgParsingRules() { ,(5000, ` + strconv.Itoa(objSubTypeMessageCraftStockReq) + `, "Crafting Stock Req", "^⚒Crafting$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockEmpty) + `, "Stock Empty", "^\\[empty\\]$") ,(5000, ` + strconv.Itoa(objSubTypeMessageStockAnyAck) + `, "Any Stock Ack", "^$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositReq) + `, "GDeposit Req", "^/g_deposit (?P[0-9]+) (?P[0-9]+)$") - ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack", "^Deposited successfully: (?P.+) \\((?P[0-9]+)\\)$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositReq) + `, "GDeposit Req", "^/g_deposit (?P[a-z0-9]+) (?P[0-9]+)$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #2", "^Deposited successfully: (?P.*) \\((?P[0-9]+)\\)$") + ,(5000, ` + strconv.Itoa(objSubTypeMessageGDepositAck) + `, "GDeposit Ack #1", "^Deposited (?P.*) \\((?P[0-9]+)\\) successfully$") ;`) failOnError(err, "resetMsgParsingRules : populate table msg_rules") } diff --git a/sql.go b/sql.go index 6931dcc..4131f36 100644 --- a/sql.go +++ b/sql.go @@ -496,8 +496,6 @@ func initDB() { ,(` + strconv.Itoa(objSubTypeMessageWithdrawReq) + `, "withdraw_req", "Withdraw Req", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageWithdrawCode) + `, "withdraw_code", "Withdraw Code", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageWithdrawRcv) + `, "withdraw_rcv", "Withdraw Received", ` + strconv.Itoa(objTypeMessage) + `) - ,(` + strconv.Itoa(objSubTypeMessageDepositReq) + `, "deposit_req", "Deposit Req", ` + strconv.Itoa(objTypeMessage) + `) - ,(` + strconv.Itoa(objSubTypeMessageDepositAck) + `, "deposit_ack", "Deposit Ack", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageStockReq) + `, "stock_req", "Stock Req", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageStockAck) + `, "stock_ack", "Stock Ack", ` + strconv.Itoa(objTypeMessage) + `) ,(` + strconv.Itoa(objSubTypeMessageMiscReq) + `, "misc_req", "Misc Req", ` + strconv.Itoa(objTypeMessage) + `) diff --git a/workers.go b/workers.go index 0dff500..1d85f77 100644 --- a/workers.go +++ b/workers.go @@ -362,8 +362,6 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) { case objSubTypeMessageWithdrawReq: case objSubTypeMessageWithdrawCode: case objSubTypeMessageWithdrawRcv: - case objSubTypeMessageDepositReq: - case objSubTypeMessageDepositAck: case objSubTypeMessageStockReq: case objSubTypeMessageMiscReq: case objSubTypeMessageGStockResReq: