From 754fd0d16cbefe342bf78a4ce791c95632725743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 28 Jun 2024 15:58:28 +0200 Subject: [PATCH 1/2] Fix labels in body of Github onPROpened notice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- src/Connections/GithubRepo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Connections/GithubRepo.ts b/src/Connections/GithubRepo.ts index dc4e452d..15a3dfbe 100644 --- a/src/Connections/GithubRepo.ts +++ b/src/Connections/GithubRepo.ts @@ -1077,7 +1077,7 @@ export class GitHubRepoConnection extends CommandConnection ({ name: l.name, description: l.description || undefined, color: l.color || undefined }))); await this.intent.sendEvent(this.roomId, { msgtype: "m.notice", - body: content + (labels.plain.length > 0 ? ` with labels ${labels}`: "") + diffContent, + body: content + (labels.plain.length > 0 ? ` with labels ${labels.plain}`: "") + diffContent, formatted_body: md.renderInline(content) + (labels.html.length > 0 ? ` with labels ${labels.html}`: "") + diffContentHtml, format: "org.matrix.custom.html", ...FormatUtil.getPartialBodyForGithubIssue(event.repository, event.pull_request), From 3113fa2d121959cb258136d8993b08cb484cf455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 28 Jun 2024 17:55:37 +0200 Subject: [PATCH 2/2] Add changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelog.d/955.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/955.bugfix diff --git a/changelog.d/955.bugfix b/changelog.d/955.bugfix new file mode 100644 index 00000000..dd208ddb --- /dev/null +++ b/changelog.d/955.bugfix @@ -0,0 +1 @@ +Fix list of labels in notice's body for GitHub opened PR webhook.