From d2e1840f13f4051e06a922c020c5ea7933f45b4d Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Wed, 31 Jul 2019 14:36:53 +0800
Subject: [PATCH] client revamping compilation fix

---
 client.go  | 2 ++
 job.go     | 2 +-
 workers.go | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client.go b/client.go
index fb2513e..044b1b9 100644
--- a/client.go
+++ b/client.go
@@ -23,6 +23,8 @@ func getLockedClient(id int64, createMissing bool) (*ChirpClient, bool) {
 		return c, true
 	} else {
 		muxClients.RUnlock()
+		//c := new(ChirpClient)
+		//return c, false
 		return nil, false
 	}
 }
diff --git a/job.go b/job.go
index e1f832f..0cbb225 100644
--- a/job.go
+++ b/job.go
@@ -352,7 +352,7 @@ func jobPillage(j Job) {
 	}
 
 	// is the job outdated now ?
-	if r.Date.Before(time.Now().Sub(3*time.Minute + 30*time.Second)) {
+	if time.Now().After(r.Date.Add(time.Minute*3 + time.Second*30)) {
 		s := TGCommand{
 			Type:       commandSendMsg,
 			Text:       fmt.Sprintf("Pillage interception expired"),
diff --git a/workers.go b/workers.go
index c7f5a5f..c4c4882 100644
--- a/workers.go
+++ b/workers.go
@@ -403,7 +403,7 @@ func SQLIdentifyMsgWorker(id int, objIds <-chan int64) {
 					cwm, err := parseSubTypeMessageGoQuestAck(m, r)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Parsing objSubTypeMessageGoQuestAck.")
 					cwm.Msg = m
-					uid, err := clientGetUserID64(m.UserID64)
+					uid, err := clientGetCWUserID64(m.UserID64)
 					logOnError(err, "SQLIdentifyMsgWorker["+strconv.Itoa(id)+"] : Retrieving UserID64.")
 					if err != nil {
 						err = setObjSubTypeId(objId, objSubTypeMessageUnknown)