From cec0421f04bc10672e12dd63abbd6fecaaa83e68 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sun, 19 May 2019 14:35:26 +0800
Subject: [PATCH] testtest

---
 def.go     | 3 +++
 rules.go   | 5 ++++-
 sql.go     | 3 +++
 workers.go | 9 +++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/def.go b/def.go
index ef92289..5efad56 100644
--- a/def.go
+++ b/def.go
@@ -193,6 +193,9 @@ const (
 	objSubTypeMessageGoArena         = 333 // 📯Arena (not done)
 	objSubTypeMessageTop             = 334 // any /topXX (not done)
 	objSubTypeMessageMenu            = 335 // main menu (not done)
+	objSubTypeMessageBuyReq          = 336 // /wtb_xx (done)
+	objSubTypeMessageSellReq         = 337 // /wts_xx (done)
+	objSubTypeMessageOrderbookReq    = 338 // /t_xx (done)
 	objSubTypeJobPillage             = 601
 	objSubTypeJobTribute             = 602
 	objSubTypeJobStatus              = 603
diff --git a/rules.go b/rules.go
index beb8fa0..997b939 100644
--- a/rules.go
+++ b/rules.go
@@ -55,7 +55,10 @@ func resetMsgParsingRules() {
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageMeReq) + `, "Me request", "^🏅Me$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageInventoryReq) + `, "Inventory request", "^/inv$")
 						        ,(5000, ` + strconv.Itoa(objSubTypeMessageTimeReq) + `, "Time request", "^/time$")
-						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePledge) + `, "Time request", "^/pledge$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessagePledge) + `, "Pledge", "^/pledge$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageBuyReq) + `, "Buy request", "^/wtb_(?P<Item>[0-9]+)_(?P<Quantity>[0-9]+)$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageSellReq) + `, "Sell request", "^/wts_(?P<Item>[0-9]+)_(?P<Quantity>[0-9]+)(_(?P<Price>[0-9]+)){0,1}$")
+						        ,(5000, ` + strconv.Itoa(objSubTypeMessageOrderbookReq) + `, "Orderbook request", "^/t_(?P<Item>[0-9]+)$")
 		;`)
 	failOnError(err, "resetMsgParsingRules : populate table msg_rules")
 }
diff --git a/sql.go b/sql.go
index b6a8d75..5a6eb75 100644
--- a/sql.go
+++ b/sql.go
@@ -337,6 +337,9 @@ func initDB() {
 						        ,(` + strconv.Itoa(objSubTypeMessageGoArena) + `, "go_arena", "Go arena", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageTop) + `, "top", "Top", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeMessageMenu) + `, "menu", "Menu", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageBuyReq) + `, "buy_req", "Sell Req", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageSellReq) + `, "sell_req", "Buy Req", ` + strconv.Itoa(objTypeMessage) + `)
+						        ,(` + strconv.Itoa(objSubTypeMessageOrderbookReq) + `, "orderbook_req", "Buy Req", ` + strconv.Itoa(objTypeMessage) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobPillage) + `, "job_pillage", "Pillage job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobTribute) + `, "job_tribute", "Tribute job", ` + strconv.Itoa(objTypeJob) + `)
 						        ,(` + strconv.Itoa(objSubTypeJobWithdrawal) + `, "job_withdraw", "Withdrawal job", ` + strconv.Itoa(objTypeJob) + `)
diff --git a/workers.go b/workers.go
index add9b7c..fb5c768 100644
--- a/workers.go
+++ b/workers.go
@@ -182,6 +182,15 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 				case objSubTypeMessageMenu:
 					err = setObjSubTypeId(objId, objSubTypeMessageMenu)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(Menu)")
+				case objSubTypeMessageBuyReq:
+					err = setObjSubTypeId(objId, objSubTypeMessageBuyReq)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(BuyReq)")
+				case objSubTypeMessageSellReq:
+					err = setObjSubTypeId(objId, objSubTypeMessageSellReq)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(SellReq)")
+				case objSubTypeMessageOrderbookReq:
+					err = setObjSubTypeId(objId, objSubTypeMessageOrderbookReq)
+					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : setObjSubTypeId(OrderbookReq)")
 				case objSubTypeMessageAuctionAnnounce:
 					cwm := ChatWarsMessageAuctionAnnounce{
 						ObjID64: objId,