Skip to content

Commit e25345b

Browse files
committed
Fix pretty and compact options support for forks text
1 parent 79f6f43 commit e25345b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

SlackPrNotification.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ var baseBranchOwner = process.env.PULL_REQUEST_BASE_BRANCH_OWNER;
1414
var baseBranchName = process.env.PULL_REQUEST_BASE_BRANCH_NAME;
1515
var sendHereMention = process.env.IS_SEND_HERE_MENTION.toLowerCase() === "true" ? "<!here>\n" : "";
1616
var prFromFork = process.env.IS_PR_FROM_FORK;
17-
var compareBranchText = prFromFork === "true" ? "*Compare branch*\n" + compareBranchOwner + ":" + compareBranchName : "*Compare branch*\n" + compareBranchName;
18-
var baseBranchText = prFromFork === "true" ? "*Base branch*\n" + baseBranchOwner + ":" + baseBranchName : "*Base branch*\n" + baseBranchName;
17+
var compareBranchText = prFromFork === "true" ? compareBranchOwner + ":" + compareBranchName : compareBranchName;
18+
var baseBranchText = prFromFork === "true" ? baseBranchOwner + ":" + baseBranchName : baseBranchName;
1919
var makePretty = process.env.MAKE_PRETTY.toLowerCase() === "true"; //Priority is pretty > compact > normal
2020
var makeCompact = process.env.MAKE_COMPACT.toLowerCase() === "true";
2121
if (makePretty) {
@@ -121,15 +121,15 @@ else {
121121
},
122122
{
123123
type: "mrkdwn",
124-
text: baseBranchText
124+
text: "*Base branch*\n" + baseBranchText
125125
},
126126
{
127127
type: "mrkdwn",
128128
text: "*Pull request number*\n#" + prNum
129129
},
130130
{
131131
type: "mrkdwn",
132-
text: compareBranchText
132+
text: "*Compare branch*\n" + compareBranchText
133133
},
134134
]
135135
},

SlackPrNotification.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const baseBranchName: string = process.env.PULL_REQUEST_BASE_BRANCH_NAME;
1414
const sendHereMention: string = process.env.IS_SEND_HERE_MENTION.toLowerCase() === "true" ? "<!here>\n" : "";
1515

1616
const prFromFork: string = process.env.IS_PR_FROM_FORK;
17-
const compareBranchText: string = prFromFork === "true" ? "*Compare branch*\n" + compareBranchOwner + ":" + compareBranchName : "*Compare branch*\n" + compareBranchName;
18-
const baseBranchText: string = prFromFork === "true" ? "*Base branch*\n" + baseBranchOwner + ":" + baseBranchName : "*Base branch*\n" + baseBranchName;
17+
const compareBranchText: string = prFromFork === "true" ? compareBranchOwner + ":" + compareBranchName : compareBranchName;
18+
const baseBranchText: string = prFromFork === "true" ? baseBranchOwner + ":" + baseBranchName : baseBranchName;
1919

2020
const makePretty: boolean = process.env.MAKE_PRETTY.toLowerCase() === "true"; //Priority is pretty > compact > normal
2121
const makeCompact: boolean = process.env.MAKE_COMPACT.toLowerCase() === "true";
@@ -121,15 +121,15 @@ if (makePretty) {
121121
},
122122
{
123123
type: "mrkdwn",
124-
text: baseBranchText,
124+
text: "*Base branch*\n" + baseBranchText,
125125
},
126126
{
127127
type: "mrkdwn",
128128
text: "*Pull request number*\n#" + prNum,
129129
},
130130
{
131131
type: "mrkdwn",
132-
text: compareBranchText,
132+
text: "*Compare branch*\n" + compareBranchText,
133133
},
134134
],
135135
},

0 commit comments

Comments
 (0)