beore preline

Closes #8

pkg/alerting/alert/alert.go

@@ -64,7 +64,7 @@ func Make(ctx context.Context, store talkgroups.Store, score trending.Score[talk
 		}
 
 		if tgRecord.Talkgroup.Name != nil {
-			d.TGName = fmt.Sprintf("%s %s [%d]", tgRecord.System.Name, *tgRecord.Talkgroup.Name, score.ID.Talkgroup)
+			d.TGName = fmt.Sprintf("%s %s (%d)", tgRecord.System.Name, *tgRecord.Talkgroup.Name, score.ID.Talkgroup)
 		} else {
 			d.TGName = fmt.Sprintf("%s:%d", tgRecord.System.Name, int(score.ID.Talkgroup))
 		}

pkg/notify/notify.go

@@ -50,31 +50,15 @@ var alertFm = template.FuncMap{
 	"highest": highest,
 }
 
-const (
-	defaultBodyTemplStr = `{{ range . -}}
+const defaultBodyTemplStr = `{{ range . -}}
 {{ .TGName }} is active with a score of {{ f .Score.Score 4 }}! ({{ f .Score.RecentCount 0 }}/{{ .Score.Count }} recent calls)
 
 {{ end -}}`
-	defaultSubjectTemplStr = `Stillbox Alert ({{ highest . }})`
-)
 
-var (
-	defaultTemplate *template.Template
-)
+var defaultBodyTemplate = template.Must(template.New("body").Funcs(common.FuncMap).Funcs(alertFm).Parse(defaultBodyTemplStr))
 
-func init() {
-	defaultTemplate = template.New("notification")
-	defaultTemplate.Funcs(common.FuncMap).Funcs(alertFm)
-	_, err := defaultTemplate.New("body").Parse(defaultBodyTemplStr)
-	if err != nil {
-		panic(err)
-	}
-
-	_, err = defaultTemplate.New("subject").Parse(defaultSubjectTemplStr)
-	if err != nil {
-		panic(err)
-	}
-}
+var defaultSubjectTemplStr = `Stillbox Alert ({{ highest . }}`
+var defaultSubjectTemplate = template.Must(template.New("subject").Funcs(common.FuncMap).Funcs(alertFm).Parse(defaultSubjectTemplStr))
 
 // Send renders and sends the Alerts.
 func (b *backend) Send(ctx context.Context, alerts []alert.Alert) (err error) {
@@ -141,10 +125,7 @@ func (n *notifier) addService(cfg config.NotifyService) (err error) {
 
 	switch cfg.SubjectTemplate {
 	case nil:
-		be.subject = defaultTemplate.Lookup("subject")
-		if be.subject == nil {
-			panic("subject template nil")
-		}
+		be.subject = defaultSubjectTemplate
 	default:
 		be.subject, err = template.New("subject").Funcs(common.FuncMap).Funcs(alertFm).Parse(*cfg.SubjectTemplate)
 		if err != nil {
@@ -154,10 +135,7 @@ func (n *notifier) addService(cfg config.NotifyService) (err error) {
 
 	switch cfg.BodyTemplate {
 	case nil:
-		be.body = defaultTemplate.Lookup("body")
-		if be.body == nil {
-			panic("body template nil")
-		}
+		be.body = defaultBodyTemplate
 	default:
 		be.body, err = template.New("body").Funcs(common.FuncMap).Funcs(alertFm).Parse(*cfg.BodyTemplate)
 		if err != nil {