opt.: push title: string -> PushFormat

Author: lollipopkit

cmd/serve.go

@@ -21,15 +21,15 @@ func init() {
 				EnvVars: []string{"SBM_ADDR"},
 			},
 			&cli.StringFlag{
-				Name: "crt",
+				Name:    "crt",
 				Aliases: []string{"c"},
-				Usage: "TLS certificate file path",
+				Usage:   "TLS certificate file path",
 				EnvVars: []string{"SBM_TLS_CRT"},
 			},
 			&cli.StringFlag{
-				Name: "key",
+				Name:    "key",
 				Aliases: []string{"k"},
-				Usage: "TLS key file path",
+				Usage:   "TLS key file path",
 				EnvVars: []string{"SBM_TLS_KEY"},
 			},
 		},
@@ -40,7 +40,7 @@ func handleServe(ctx *cli.Context) error {
 	webConfig := &model.WebConfig{
 		Addr: ctx.String("addr"),
 		Cert: ctx.String("crt"),
-		Key: ctx.String("key"),
+		Key:  ctx.String("key"),
 	}
 	runner.Start(webConfig)
 	return nil

model/config.go

@@ -122,9 +122,9 @@ var (
 		"action": "send_group_msg",
 		"params": map[string]interface{}{
 			"group_id": 123456789,
-			"message":  res.PushFormatNameLocator + 
-						"\n" + 
-						res.PushFormatMsgLocator,
+			"message": res.PushFormatNameLocator +
+				"\n" +
+				res.PushFormatMsgLocator,
 		},
 	}
 	defaultWekhookBodyBytes, _ = json.Marshal(defaultWebhookBody)

model/push.go

@@ -79,9 +79,9 @@ func (pf PushFormat) Format(args []*PushPair) string {
 		ss = append(ss, kv)
 	}
 	msgReplaced := strings.Replace(
-		string(pf), 
-		res.PushFormatMsgLocator, 
-		strings.Join(ss, `\n`), 
+		string(pf),
+		res.PushFormatMsgLocator,
+		strings.Join(ss, `\n`),
 		1,
 	)
 	nameReplaced := strings.Replace(
@@ -107,17 +107,18 @@ type PushIface interface {
 
 type PushIfaceIOS struct {
 	Token     string     `json:"token"`
-	Title     string     `json:"title"`
+	Title     PushFormat `json:"title"`
 	Content   PushFormat `json:"content"`
 	BodyRegex string     `json:"body_regex"`
 	Code      int        `json:"code"`
 }
 
 func (p PushIfaceIOS) push(args []*PushPair) error {
 	content := p.Content.Format(args)
+	title := p.Title.Format(args)
 	body := map[string]string{
 		"token":   p.Token,
-		"title":   p.Title,
+		"title":   title,
 		"content": content,
 	}
 	bodyBytes, err := json.Marshal(body)
@@ -185,15 +186,21 @@ func (p PushIfaceWebhook) push(args []*PushPair) error {
 
 type PushIfaceServerChan struct {
 	SCKey     string     `json:"sckey"`
-	Title     string     `json:"title"`
+	Title     PushFormat `json:"title"`
 	Desp      PushFormat `json:"desp"`
 	BodyRegex string     `json:"body_regex"`
 	Code      int        `json:"code"`
 }
 
 func (p PushIfaceServerChan) push(args []*PushPair) error {
 	desp := p.Desp.Format(args)
-	url := fmt.Sprintf("https://sctapi.ftqq.com/%s.send?title=%s&desp=%s", p.SCKey, p.Title, desp)
+	title := p.Title.Format(args)
+	url := fmt.Sprintf(
+		"https://sctapi.ftqq.com/%s.send?title=%s&desp=%s",
+		p.SCKey,
+		title,
+		desp,
+	)
 	resp, code, err := http.Do("GET", url, nil, nil)
 	if err != nil {
 		return err

model/web.go

@@ -19,4 +19,4 @@ func (wc *WebConfig) HaveTLS() bool {
 		return false
 	}
 	return true
-}
+}

res/res.go

@@ -36,7 +36,7 @@ const (
 	DefaultInterval = time.Second * 7
 	MaxInterval     = time.Second * 10
 
-	PushFormatMsgLocator = "{{msg}}"
+	PushFormatMsgLocator  = "{{msg}}"
 	PushFormatNameLocator = "{{name}}"
 )