chore: general formatting

.github/workflows/discord-push.yml

@@ -10,4 +10,4 @@ jobs:
         uses: ChatDisabled/discord-commits@main
         with:
           id: ${{ secrets.DISCORD_WEBHOOK_ID }}
-          token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+          token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}

action.yml

@@ -11,9 +11,6 @@ inputs:
   token:
     description: The Discord Webhook Token
     required: true
-  threadId:
-    description: If you want to send the embed message in a specific thread
-    required: false
 
 runs:
   using: 'node16'

src/discord.js

@@ -1,85 +1,70 @@
 const { MessageEmbed, WebhookClient } = require('discord.js')
-const MAX_MESSAGE_LENGTH = 40
+const MAX_MESSAGE_LENGTH = 72
 
-module.exports.send = (id, token, repo, branch, url, commits, size, threadId) =>
+module.exports.send = (id, token, repo, url, commits, size, pusher) =>
   new Promise((resolve, reject) => {
-      let client
-      console.log('Preparing Webhook...')
-      try {
-          client = new WebhookClient({
-              id: id,
-              token: token,
-          })
-
-          if (threadId) {
-              if (isNaN(threadId)) {
-                  throw new Error('threadId is not a number')
-              }
-              console.log('Found thread ID')
-              client
-                .send({
-                    username: repo,
-                    embeds: [createEmbed(repo, branch, url, commits, size)],
-                    threadId: threadId,
-                })
-                .then(() => {
-                    console.log('Successfully sent the message!')
-                    resolve()
-                }, reject)
-          } else {
-              client
-                .send({
-                    username: repo,
-                    embeds: [createEmbed(repo, branch, url, commits, size)],
-                })
-                .then(() => {
-                    console.log('Successfully sent the message!')
-                    resolve()
-                }, reject)
-          }
-      } catch (error) {
-          console.log('Error creating Webhook')
-          reject(error.message)
-          return
-      }
+    let client
+    const username = repo.replace(/(discord)/gi, '******')
+    console.log('Preparing Webhook...')
+    try {
+      client = new WebhookClient({
+        id: id,
+        token: token,
+      })
+      client
+        .send({
+          username: username,
+          embeds: [createEmbed(url, commits, size, pusher)],
+        })
+        .then(() => {
+          console.log('Successfully sent the message!')
+          resolve()
+        }, reject)
+    } catch (error) {
+      console.log('Error creating Webhook')
+      reject(error.message)
+      return
+    }
   })
 
-function createEmbed(repo, branch, url, commits, size) {
-    console.log('Constructing Embed...')
-    console.log('Commits :')
-    console.log(commits)
-    if (!commits) {
-        console.log('No commits, skipping...')
-        return
-    }
-    const latest = commits[0]
-    return new MessageEmbed()
-      .setColor(0xF1E542)
-      .setAuthor({
-          name: `⚡ ${latest.author.username} pushed ${size} commit${size === 1 ? '' : 's'}`,
-          iconURL: `https://github.com/${latest.author.username}.png?size=32`,
-          url: url
-      })
-      .setDescription(`${getChangeLog(commits, size)}`)
-      .setTimestamp(Date.parse(latest.timestamp))
+function createEmbed(url, commits, size, pusher) {
+  console.log('Constructing Embed...')
+  console.log('Commits :')
+  console.log(commits)
+  if (!commits) {
+    console.log('No commits, skipping...')
+    return
+  }
+  const latest = commits[0]
+  return new MessageEmbed()
+    .setColor(0xf1e542)
+    .setAuthor({
+      name: `⚡ ${pusher} pushed ${size} commit${
+        size === 1 ? '' : 's'
+      }`,
+      iconURL: `https://github.com/${pusher}.png?size=64`,
+      url: url,
+    })
+    .setDescription(`${getChangeLog(commits, size)}`)
+    .setTimestamp(Date.parse(latest.timestamp))
 }
 
 function getChangeLog(commits, size) {
-    let changelog = ''
-    for (const i in commits) {
-        if (i > 7) {
-            changelog += `+ ${size - i} more...\n`
-            break
-        }
-
-        const commit = commits[i]
-        const sha = commit.id.substring(0, 6)
-        const message =
-          commit.message.length > MAX_MESSAGE_LENGTH
-            ? commit.message.substring(0, MAX_MESSAGE_LENGTH) + '...'
-            : commit.message
-        changelog += `[\`${sha}\`](${commit.url}) — ${message} ([\`${commit.author.username}\`](https://github.com/${commit.author.username}))\n`
+  let changelog = ''
+  for (const i in commits) {
+    if (i > 7) {
+      changelog += `+ ${size - i} more...\n`
+      break
     }
 
-    return changelog
-}
+    const commit = commits[i]
+    const sha = commit.id.substring(0, 6)
+    const message =
+      commit.message.length > MAX_MESSAGE_LENGTH
+        ? commit.message.substring(0, MAX_MESSAGE_LENGTH) + '...'
+        : commit.message
+    changelog += `[\`${sha}\`](${commit.url}) — ${message} ([\`${commit.author.username}\`](https://github.com/${commit.author.username}))\n`
+  }
+
+  return changelog
+}

src/index.js

@@ -1,35 +1,40 @@
 const core = require('@actions/core')
 const github = require('@actions/github')
-
 const webhook = require('../src/discord.js')
 
 async function run() {
-	const payload = github.context.payload
-	const repository = payload.repository.name
-	const commits = payload.commits
-	const size = commits.length
-	const branch = payload.ref.split('/')[payload.ref.split('/').length - 1]
-
-	console.log(`Received payload.`)
-
-	console.log(`Received ${commits.length}/${size} commits...`)
-
-	if (commits.length === 0) {
-		console.log(`No commits, skipping...`)
-		return
-	}
-
-	const id = core.getInput('id')
-	const token = core.getInput('token')
-	const threadId = core.getInput('threadId')
-
-	webhook
-		.send(id, token, repository, branch, payload.compare, commits, size, threadId)
-		.catch((err) => core.setFailed(err.message))
+  const payload = github.context.payload
+  const repository = payload.repository.name
+  const commits = payload.commits
+  const size = commits.length
+
+  console.log(`Received payload.`)
+
+  console.log(`Received ${commits.length}/${size} commits...`)
+
+  if (commits.length === 0) {
+    console.log(`No commits, skipping...`)
+    return
+  }
+
+  const id = core.getInput('id')
+  const token = core.getInput('token')
+
+  webhook
+    .send(
+      id,
+      token,
+      repository,
+      payload.compare,
+      commits,
+      size,
+      payload.pusher.name
+    )
+    .catch((err) => core.setFailed(err.message))
 }
 
 try {
-	run()
+  run()
 } catch (error) {
-	core.setFailed(error.message)
-}
+  core.setFailed(error.message)
+}