refactor: edit style of new option

boywithkeyboard-archive · Aug 30, 2023 · 5c5cfdc · 5c5cfdc
1 parent f3dcaac
commit 5c5cfdc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/action.js b/action.js
@@ -21053,7 +21053,7 @@ async function action() {
     releaseBody += `
 * ${linkifyReferences(title)}`
     if (config.includeAuthor && user?.login) {
-      contributors.add(`@${user.login}`)
+      contributors.add(`, @${user.login}`)
       releaseBody += ` by @${user.login}`
     }
     if (config.includeDescription && body !== null && body.length > 0) {
@@ -21064,9 +21064,14 @@ ${indentString(body, 2)}
     }
   }
   if (config.mentionContributors) {
+    const arr = [...contributors.values()]
+    arr[0] = arr[0].replace(', ', '')
+    arr[arr.length - 1] = arr.length > 2
+      ? arr[arr.length - 1].replace(', ', ', & ')
+      : arr[arr.length - 1].replace(', ', ' & ')
     releaseBody += `
 
-${[...contributors.values()].join(' ')}`
+###### Contributed by ${arr.join('')}`
   }
   const { data: release } = await rest.repos.createRelease({
     owner: import_github.context.repo.owner,

diff --git a/action.ts b/action.ts
@@ -239,7 +239,7 @@ async function action() {
       //   ? ` by [@${user?.login}](https://github.com/${user?.login})`
       //   : ''
 
-      contributors.add(`@${user.login}`)
+      contributors.add(`, @${user.login}`)
       releaseBody += ` by @${user.login}`
     }
 
@@ -250,7 +250,14 @@ async function action() {
   }
 
   if (config.mentionContributors) {
-    releaseBody += `\n\n${[...contributors.values()].join(' ')}`
+    const arr = [...contributors.values()]
+
+    arr[0] = arr[0].replace(', ', '')
+    arr[arr.length - 1] = arr.length > 2
+      ? arr[arr.length - 1].replace(', ', ', & ')
+      : arr[arr.length - 1].replace(', ', ' & ')
+
+    releaseBody += `\n\n###### Contributed by ${arr.join('')}`
   }
 
   const { data: release } = await rest.repos.createRelease({