From b4aba68551bda4eced0555fe666c2c6e94869a5a Mon Sep 17 00:00:00 2001 From: Joao Ethan Date: Sun, 14 Dec 2025 18:01:40 +0100 Subject: [PATCH 1/4] Added collapsed style for issue labeled subscriptions mattermost/mattermost-plugin-github#740 --- server/plugin/template.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/plugin/template.go b/server/plugin/template.go index bb024776d..ccb85327e 100644 --- a/server/plugin/template.go +++ b/server/plugin/template.go @@ -307,9 +307,13 @@ Reviewers: {{range $i, $el := .RequestedReviewers -}} {{- if $i}}, {{end}}{{temp `)) template.Must(masterTemplate.New("issueLabelled").Funcs(funcMap).Parse(` +{{- if eq .Config.style "collapsed" -}} +{{template "repo" .Event.GetRepo}} issue {{template "issue" .Event.GetIssue}} labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. +{{- else -}} #### {{.Event.GetIssue.GetTitle}} ##### {{template "eventRepoIssue" .Event}} #issue-labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. +{{- end -}} `)) template.Must(masterTemplate.New("reopenedIssue").Funcs(funcMap).Parse(` From 77eea3bca5ede9f1ddb6577f6a030d1c2f4cdd4d Mon Sep 17 00:00:00 2001 From: Joao Ethan Date: Sun, 14 Dec 2025 18:44:29 +0100 Subject: [PATCH 2/4] fix: fix a rendering error --- server/plugin/template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugin/template.go b/server/plugin/template.go index ccb85327e..7fb405ddf 100644 --- a/server/plugin/template.go +++ b/server/plugin/template.go @@ -307,7 +307,7 @@ Reviewers: {{range $i, $el := .RequestedReviewers -}} {{- if $i}}, {{end}}{{temp `)) template.Must(masterTemplate.New("issueLabelled").Funcs(funcMap).Parse(` -{{- if eq .Config.style "collapsed" -}} +{{- if eq .Config.Style "collapsed" -}} {{template "repo" .Event.GetRepo}} issue {{template "issue" .Event.GetIssue}} labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. {{- else -}} #### {{.Event.GetIssue.GetTitle}} From c12c89f69cf848b1fdbdd559edb7618ba1f67633 Mon Sep 17 00:00:00 2001 From: JOAO-Ethan <106932691+JOAO-Ethan@users.noreply.github.com> Date: Tue, 16 Dec 2025 00:33:52 +0100 Subject: [PATCH 3/4] Added \n to match tests --- server/plugin/template.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/plugin/template.go b/server/plugin/template.go index 7fb405ddf..61832d4ac 100644 --- a/server/plugin/template.go +++ b/server/plugin/template.go @@ -310,9 +310,11 @@ Reviewers: {{range $i, $el := .RequestedReviewers -}} {{- if $i}}, {{end}}{{temp {{- if eq .Config.Style "collapsed" -}} {{template "repo" .Event.GetRepo}} issue {{template "issue" .Event.GetIssue}} labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. {{- else -}} + #### {{.Event.GetIssue.GetTitle}} ##### {{template "eventRepoIssue" .Event}} #issue-labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. + {{- end -}} `)) From 291913839231dd69016ecaebeb7a82a01c23f75d Mon Sep 17 00:00:00 2001 From: Joao Ethan Date: Tue, 30 Dec 2025 17:20:19 +0100 Subject: [PATCH 4/4] fix: Added mandatory \n --- server/plugin/template.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/plugin/template.go b/server/plugin/template.go index 61832d4ac..37dc90e09 100644 --- a/server/plugin/template.go +++ b/server/plugin/template.go @@ -311,9 +311,9 @@ Reviewers: {{range $i, $el := .RequestedReviewers -}} {{- if $i}}, {{end}}{{temp {{template "repo" .Event.GetRepo}} issue {{template "issue" .Event.GetIssue}} labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. {{- else -}} -#### {{.Event.GetIssue.GetTitle}} +\n#### {{.Event.GetIssue.GetTitle}} ##### {{template "eventRepoIssue" .Event}} -#issue-labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}. +#issue-labeled ` + "`{{.Event.GetLabel.GetName}}`" + ` by {{template "user" .Event.GetSender}}.\n {{- end -}} `))