Fix ntfy panic

ahobsonsayers · Oct 12, 2024 · b904024 · b904024
1 parent 8e4eadd
commit b904024
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cmd/twitchets/notification/notification.go b/cmd/twitchets/notification/notification.go
@@ -55,10 +55,14 @@ type renderMessageConfig struct {
 	includeFooter bool
 }
 
-func (c *renderMessageConfig) applyOptions(options ...RenderMessageOption) {
+func newRenderMessageConfig(options ...RenderMessageOption) renderMessageConfig {
+	config := new(renderMessageConfig)
 	for _, option := range options {
-		option(c)
+		if option != nil {
+			option(config)
+		}
 	}
+	return *config
 }
 
 type RenderMessageOption func(*renderMessageConfig)
@@ -78,8 +82,7 @@ func WithFooter() RenderMessageOption {
 }
 
 func RenderMessage(ticket twickets.Ticket, options ...RenderMessageOption) (string, error) {
-	config := &renderMessageConfig{}
-	config.applyOptions(options...)
+	config := newRenderMessageConfig(options...)
 
 	templateData := MessageTemplateData{
 		Date:                ticket.Event.Date.Format("Monday 2 January 2006"),

diff --git a/cmd/twitchets/notification/ntfy.go b/cmd/twitchets/notification/ntfy.go
@@ -21,7 +21,7 @@ type NtfyClient struct {
 var _ Client = NtfyClient{}
 
 func (c NtfyClient) SendTicketNotification(ticket twickets.Ticket) error {
-	notificationMessage, err := RenderMessage(ticket, nil)
+	notificationMessage, err := RenderMessage(ticket)
 	if err != nil {
 		return err
 	}