Fix pretty and compact options support for forks text

jun3453 · Jul 14, 2021 · e25345b · e25345b
1 parent 79f6f43
commit e25345b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/SlackPrNotification.js b/SlackPrNotification.js
@@ -14,8 +14,8 @@ var baseBranchOwner = process.env.PULL_REQUEST_BASE_BRANCH_OWNER;
 var baseBranchName = process.env.PULL_REQUEST_BASE_BRANCH_NAME;
 var sendHereMention = process.env.IS_SEND_HERE_MENTION.toLowerCase() === "true" ? "<!here>\n" : "";
 var prFromFork = process.env.IS_PR_FROM_FORK;
-var compareBranchText = prFromFork === "true" ? "*Compare branch*\n" + compareBranchOwner + ":" + compareBranchName : "*Compare branch*\n" + compareBranchName;
-var baseBranchText = prFromFork === "true" ? "*Base branch*\n" + baseBranchOwner + ":" + baseBranchName : "*Base branch*\n" + baseBranchName;
+var compareBranchText = prFromFork === "true" ? compareBranchOwner + ":" + compareBranchName : compareBranchName;
+var baseBranchText = prFromFork === "true" ? baseBranchOwner + ":" + baseBranchName : baseBranchName;
 var makePretty = process.env.MAKE_PRETTY.toLowerCase() === "true"; //Priority is pretty > compact > normal
 var makeCompact = process.env.MAKE_COMPACT.toLowerCase() === "true";
 if (makePretty) {
@@ -121,15 +121,15 @@ else {
                     },
                     {
                         type: "mrkdwn",
-                        text: baseBranchText
+                        text: "*Base branch*\n" + baseBranchText
                     },
                     {
                         type: "mrkdwn",
                         text: "*Pull request number*\n#" + prNum
                     },
                     {
                         type: "mrkdwn",
-                        text: compareBranchText
+                        text: "*Compare branch*\n" + compareBranchText
                     },
                 ]
             },

diff --git a/SlackPrNotification.ts b/SlackPrNotification.ts
@@ -14,8 +14,8 @@ const baseBranchName: string = process.env.PULL_REQUEST_BASE_BRANCH_NAME;
 const sendHereMention: string = process.env.IS_SEND_HERE_MENTION.toLowerCase() === "true" ? "<!here>\n" : "";
 
 const prFromFork: string = process.env.IS_PR_FROM_FORK;
-const compareBranchText: string = prFromFork === "true" ? "*Compare branch*\n" + compareBranchOwner + ":" + compareBranchName : "*Compare branch*\n" + compareBranchName;
-const baseBranchText: string = prFromFork === "true" ? "*Base branch*\n" + baseBranchOwner + ":" + baseBranchName : "*Base branch*\n" + baseBranchName;
+const compareBranchText: string = prFromFork === "true" ? compareBranchOwner + ":" + compareBranchName : compareBranchName;
+const baseBranchText: string = prFromFork === "true" ? baseBranchOwner + ":" + baseBranchName : baseBranchName;
 
 const makePretty: boolean = process.env.MAKE_PRETTY.toLowerCase() === "true"; //Priority is pretty > compact > normal
 const makeCompact: boolean = process.env.MAKE_COMPACT.toLowerCase() === "true";
@@ -121,15 +121,15 @@ if (makePretty) {
                     },
                     {
                         type: "mrkdwn",
-                        text: baseBranchText,
+                        text: "*Base branch*\n" + baseBranchText,
                     },
                     {
                         type: "mrkdwn",
                         text: "*Pull request number*\n#" + prNum,
                     },
                     {
                         type: "mrkdwn",
-                        text: compareBranchText,
+                        text: "*Compare branch*\n" + compareBranchText,
                     },
                 ],
             },