From 8bde59743e37d34d1d54f01ecd4a111792026774 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Fri, 13 Dec 2019 17:37:20 +0800
Subject: [PATCH] test set def

---
 cron.go |  1 +
 job.go  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cron.go b/cron.go
index 03af37b..084041d 100644
--- a/cron.go
+++ b/cron.go
@@ -12,6 +12,7 @@ func startCron() *cron.Cron {
 	c := cron.New(cron.WithLocation(time.UTC))
 	c.AddFunc("15 7,15,23 * * *", cronSendWarReport)
 	c.AddFunc("58 6,14,22 * * *", cronSetDef)
+	c.AddFunc("@every 1m", cronSetDef)
 	c.Start()
 	return c
 }
diff --git a/job.go b/job.go
index b5f4b97..4159f58 100644
--- a/job.go
+++ b/job.go
@@ -1158,10 +1158,10 @@ func jobFwdMsg(j Job) {
 	err = json.Unmarshal(j.Payload, &p)
 	logOnError(err, "jobFwdMsg : Unmarshal payload")
 
-	cwm, err := getObjMsg(j.Trigger)
+	msg, err := getObjMsg(j.Trigger)
 	logOnError(err, "jobFwdMsg : getObjMsg msg")
 
-	clientFwdCWMsg(j.UserID64, cwm.ID64, cwm.ChatID64, p.ChatID64)
+	clientFwdCWMsg(j.UserID64, msg.ID64, msg.ChatID64, p.ChatID64)
 
 	err = setJobDone(j.ID64)
 	logOnError(err, "jobFwdMsg : setJobDone")
@@ -1177,8 +1177,15 @@ func jobSetDef(j Job) {
 	err = json.Unmarshal(j.Payload, &p)
 	logOnError(err, "jobSetDef : Unmarshal payload")
 
-	cwm, err := getObjMsg(j.Trigger)
+	msg, err := getObjMsg(j.Trigger)
 	logOnError(err, "jobSetDef : getObjMsg msg")
+	rule, err := getMsgParsingRule(msg)
+	logOnError(err, "jobSetDef : getMsgParsingRule")
+	cwm, err := parseSubTypeMessageMeAck(msg, rule.re)
+
+	if cwm.State == `🛌Rest` {
+		clientSendCWMsg(j.UserID64, `🛡Defend`)
+	}
 
 	err = setJobDone(j.ID64)
 	logOnError(err, "jobSetDef : setJobDone")