From 06b697067cdb27c793926ce14b6dea057f58cac1 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Sun, 26 May 2019 21:06:12 +0800
Subject: [PATCH] test

---
 bot.go     | 20 ++++++++++----------
 def.go     |  1 +
 job.go     | 15 +++++++++++++++
 workers.go |  2 ++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/bot.go b/bot.go
index 4b02e39..08da7fd 100644
--- a/bot.go
+++ b/bot.go
@@ -284,18 +284,18 @@ func botTimer(m *tb.Message) {
 			}
 			TGCmdQueue <- c
 		} else {
-			log.Printf("Timer : Event : %s\n", time.Now().Add(d).Format(time.RFC822))
+			log.Printf("Timer : Event : %s\n", time.Now().Add(d).Format(time.RFC850))
+			c := TGCommand{
+				Type: commandSendMsg,
+				Text: "", r.ReplaceAllString(m.Payload, "${Msg}"),
+				FromUserID64: m.Chat.ID,
+				ToChatID64:   userID64ChtWrsBot,
+			}
+			b, _ := json.Marshal(c)
+			err := createJob(objSubTypeJobMsgClient, objJobPriority, int64(m.Sender.ID), time.Now(), b)
 		}
 
 	}
-	/*
-		c := TGCommand{
-			Type:         commandReplyMsg,
-			Text:         res,
-			FromMsgID64:  int64(m.ID),
-			FromChatID64: m.Chat.ID,
-		}
-		TGCmdQueue <- c
-	*/
+
 	return
 }
diff --git a/def.go b/def.go
index 78333d9..af77bc6 100644
--- a/def.go
+++ b/def.go
@@ -252,6 +252,7 @@ const (
 	objSubTypeJobGStock              = 605
 	objSubTypeJobRescanMsg           = 606
 	objSubTypeJobSetJobDone          = 607
+	objSubTypeJobMsgClient           = 608
 	objSubTypeItemResource           = 701
 	objSubTypeItemAlch               = 702
 	objSubTypeItemMisc               = 703
diff --git a/job.go b/job.go
index f9d430a..c50f340 100644
--- a/job.go
+++ b/job.go
@@ -120,3 +120,18 @@ func jobPillage(j Job) {
 	logOnError(err, "jobSetDone : setJobDone")
 	return
 }
+
+func jobMsgClient(j Job) {
+	var c TGCommand
+	err := setJobStart(j.ID64)
+	logOnError(err, "jobMsgClient : setJobStart")
+
+	err = json.Unmarshal(j.Payload, &c)
+	logOnError(err, "jobMsgClient : Unmarshal payload")
+
+	MQTGCmdQueue <- c
+
+	err := setJobDone(j.ID64)
+	logOnError(err, "joMsgClient : setJobDone")
+	return
+}
diff --git a/workers.go b/workers.go
index a4c03f4..4069cf5 100644
--- a/workers.go
+++ b/workers.go
@@ -271,6 +271,8 @@ func SQLJobWorker(id int) {
 				jobSetDone(j)
 			case objSubTypeJobPillage:
 				jobPillage(j)
+			case objSubTypeJobMsgClient:
+				jobMsgClient(j)
 			default:
 				log.Printf("SQLJobWorker["+strconv.Itoa(id)+"] : No handler for job type #%d.\n", j.JobTypeID)
 			}