setup for auto def

bot.go

@@ -923,6 +923,11 @@ func botUserConfig(m *ChatWarsMessage) {
 	} else {
 		out = fmt.Sprintf("%s  Pillage : OFF (<a href=\"https://t.me/share/url?url=/config_pillage_on\">set on</a>)\n", out)
 	}
+	if clt.Config.Wartime == `🛡Defend` {
+		out = fmt.Sprintf("%s  Wartime : DEFEND CASTLE (<a href=\"https://t.me/share/url?url=/config_def_guild\">set to guild</a>)\n", out)
+	} else {
+		out = fmt.Sprintf("%s  Wartime : DEFEND GUILD (<a href=\"https://t.me/share/url?url=/config_def_castle\">set to castle</a>)\n", out)
+	}
 	c := TGCommand{
 		Type:         commandReplyMsg,
 		Text:         out,

client.go

@@ -35,6 +35,14 @@ func loadClients() error {
 		if cx.Config == nil {
 			cx.Config = &ChirpConfig{
 				InterceptPillage: true,
+				Wartime:          `🛡Defend`,
+			}
+		} else {
+			if cx.Config.InterceptPillage == nil {
+				cx.Config.InterceptPillage = true
+			}
+			if cx.Config.Wartime == nil {
+				cx.Config.Wartime = `🛡Defend`
 			}
 		}
 		/*

def.go

@@ -103,6 +103,7 @@ type ChirpConfig struct {
 	AutoDeposit      bool     `json:"auto_deposit"`
 	AutoDepositItems []string `json:"auto_deposit_items"`
 	AutoDepositTypes []string `json:"auto_deposit_types"`
+	Wartime          string   `json:"wartime"`
 }
 
 type ChirpClient struct {

job.go

@@ -1868,7 +1868,9 @@ func jobSetDef(j Job) {
 	cwm, err := parseSubTypeMessageMeAck(msg, rule.re)
 
 	if cwm.State == `🛌Rest` {
-		clientSendCWMsg(j.UserID64, `🛡Defend`)
+		clt, err := getLockedClient(j.UserID64, false)
+		clt.Mux.Unlock()
+		clientSendCWMsg(j.UserID64, clt.Config.Wartime)
 	}
 
 	err = setJobDone(j.ID64)