feat: multiple discord+slack ids support (shubhaamgupta11#22)

shubhaamgupta11 · web-flow · commit d105ac9ad269 · 2025-01-28T14:58:46.000+05:30
* feat: added multiple slack and discord ids support

* feat: version bumup to 1.0.1
diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ This [GitHub Action](https://github.com/marketplace/actions/repo-activity-monito
 
 - Tracking new issues and pull requests.
 - Sending auto-generated notifications to **Slack** or **Discord**.
-- Customizing **Slack** notifications with the ability to ping specific users or groups.
-- Customizing **Discord** notifications with the ability to ping specific users or roles.
+- Customizing **Slack** notifications with the ability to multiple users or groups.
+- Customizing **Discord** notifications with the ability to multiple users or roles.
 - Allowing **Slack** notifications to be sent to designated channels.
 
 With **Repo Activity Monitor**, you can stay on top of your repositories activities, streamline communication, and ensure no critical issues or pull requests fall through the cracks.
@@ -49,7 +49,7 @@ jobs:
           slack_bot_token: "${{ secrets.SLACK_BOT_TOKEN }}"
           slack_channel: "<channel-id>"
           slack_id_type: "<user/group>" # Optional: Only needed to ping someone directly.
-          slack_id: "<user-id/group-id>" # Optional: Only needed if slack_id_type is provided.
+          slack_ids: "<user-id/group-id>" # Optional: Only needed if slack_id_type is provided. Can pass multiple similar type ids separated by commas. e.g. "Uyyyxxxx,Uzzzxxxx"
 ```
 
 > **Note:** slack_id_type and slack_id are only needed if you want to ping someone directly.
@@ -86,7 +86,7 @@ jobs:
           # Discord-specific inputs
           discord_webhook_url: "${{ secrets.DISCORD_WEBHOOK_URL }}"
           discord_id_type: "<user/role>" # Optional: Only needed to ping someone directly.
-          discord_id: "<user-id/role-id>" # Optional: Only needed if discord_id_type is provided.
+          discord_ids: "<user-id/role-id>" # Optional: Only needed if discord_id_type is provided. Can pass multiple similar type ids separated by commas. e.g. "Uyyyxxxx,Uzzzxxxx"
 ```
 
 > **Note:** You can configure any notifier (slack, discord) for any task (monitor-issues, monitor-prs, etc.). 
@@ -130,10 +130,10 @@ For Pull Requests
 | slack_bot_token | Slack bot token to send notifications (required if notifier=`slack`). | No | None |
 | slack_channel | The Slack channel id to send notifications to (required if notifier=`slack`). | No | None |
 | slack_id_type | Type of Slack ID (user or group, required if notifier=`slack`). This is needed to ping someone directly. | No | None |
-| slack_id | user id or group id as per `slack_id_type` (required if notifier=`slack`). | No | None |
+| slack_ids | user id or group id as per `slack_id_type` (required if notifier=`slack`). Can pass multiple similar type ids separated by commas. e.g. "Uyyyxxxx,Uzzzxxxx" | No | None |
 | discord_webhook_url | Discord webhook URL to send notifications (required if notifier=`discord`). | No | None |
 | discord_id_type | Type of Discord ID (user or role, required if notifier=`discord`). This is needed to ping someone directly. | No | None |
-| discord_id | user id or role id as per `discord_id_type` (required if notifier=`discord`). | No | None |
+| discord_ids | user id or role id as per `discord_id_type` (required if notifier=`discord`). Can pass multiple similar type ids separated by commas. e.g. "Uyyyxxxx,Uzzzxxxx" | No | None |
 
 ## 📖 How It Works
 - The action listens for new issues or PRs in the specified GitHub repository.
@@ -145,7 +145,7 @@ For Pull Requests
 
 ### Slack
 
-- Create a [Slack App](https://api.slack.com/bot-users#creating-bot-user).
+- Create a [Slack App](https://api.slack.com/quickstart).
 - Generate a Slack Bot Token.
 - Retrieve the Channel ID and User/Group IDs.
 - Add these secrets to your GitHub repository:
diff --git a/action.yml b/action.yml
@@ -34,8 +34,8 @@ inputs:
   slack_id_type:
     description: Type of Slack ID (user or group).
     required: false
-  slack_id:
-    description: Slack ID of the recipient (user or group).
+  slack_ids:
+    description: Slack IDs of the recipients (user or group) must be comma separated and all must be of same type.
     required: false
   # Discord-specific inputs
   discord_webhook_url:
@@ -44,8 +44,8 @@ inputs:
   discord_id_type:
     description: Type of Discord ID (user or role).
     required: false
-  discord_id:
-    description: Discord ID of the recipient (user or role).
+  discord_ids:
+    description: Discord IDs of the recipients (user or role) must be comma separated and all must be of same type.
     required: false
 
 
diff --git a/action/index.js b/action/index.js
@@ -17,12 +17,12 @@ async function run() {
     const slackToken = core.getInput("slack_bot_token");
     const slackChannel = core.getInput("slack_channel");
     const slackIDType = core.getInput("slack_id_type");
-    const slackID = core.getInput("slack_id");
+    const slackIDs = core.getInput("slack_ids");
 
     // Discord-specific inputs
     const discordWebhookUrl = core.getInput("discord_webhook_url");
     const discordIDType = core.getInput("discord_id_type");
-    const discordID = core.getInput("discord_id");
+    const discordIDs = core.getInput("discord_ids");
 
     switch (task) {
       case "monitor-issues":
@@ -31,8 +31,8 @@ async function run() {
           owner,
           repo,
           notifier,
-          slackConfig: { slackToken, slackChannel, slackIDType, slackID },
-          discordConfig: { discordWebhookUrl, discordIDType, discordID },
+          slackConfig: { slackToken, slackChannel, slackIDType, slackIDs },
+          discordConfig: { discordWebhookUrl, discordIDType, discordIDs },
           alertTime,
         });
         break;
@@ -43,8 +43,8 @@ async function run() {
           owner,
           repo,
           notifier,
-          slackConfig: { slackToken, slackChannel, slackIDType, slackID },
-          discordConfig: { discordWebhookUrl, discordIDType, discordID },
+          slackConfig: { slackToken, slackChannel, slackIDType, slackIDs },
+          discordConfig: { discordWebhookUrl, discordIDType, discordIDs },
           alertTime,
         });
         break;
diff --git a/action/integrations/discord.js b/action/integrations/discord.js
@@ -17,7 +17,7 @@ const discordWrapper = (webhookUrl) => {
 };
 
 // Send Discord Notifications
-const sendDiscordNotification = async (webhookUrl, issues, repo, type, discordIDType, discordID) => {
+const sendDiscordNotification = async (webhookUrl, issues, repo, type, discordIDType, discordIDs) => {
     if (!issues.length) {
       console.log("No issues found within the specified time frame.");
       return;
@@ -27,7 +27,7 @@ const sendDiscordNotification = async (webhookUrl, issues, repo, type, discordID
 
 
     for (const issue of issues) {
-      let payload = generateDiscordPayload({type, repo, issue, discordIDType, discordID});
+      let payload = generateDiscordPayload({type, repo, issue, discordIDType, discordIDs});
   
       try {
         await discord.sendMessage(payload);
diff --git a/action/integrations/slack.js b/action/integrations/slack.js
@@ -29,7 +29,7 @@ const sendSlackNotification = async (
   slackToken,
   slackChannel,
   slackIDType,
-  slackID,
+  slackIDs,
   issues,
   repo,
   type
@@ -47,7 +47,7 @@ const sendSlackNotification = async (
       repo,
       issue,
       slackIDType,
-      slackID,
+      slackIDs,
     });
 
     try {
diff --git a/action/monitor-new-issue.js b/action/monitor-new-issue.js
@@ -88,7 +88,7 @@ async function monitorIssues({
       slackToken,
       slackChannel,
       slackIDType,
-      slackID,
+      slackIDs,
     } = slackConfig;
     console.log(
       "🔔 Sending notifications to Slack for issues:",
@@ -98,7 +98,7 @@ async function monitorIssues({
       slackToken,
       slackChannel,
       slackIDType,
-      slackID,
+      slackIDs,
       issues,
       repo,
       "issue"
@@ -107,13 +107,13 @@ async function monitorIssues({
     const {
       discordWebhookUrl,
       discordIDType,
-      discordID,
+      discordIDs,
     } = discordConfig;
     console.log(
       "🔔 Sending notifications to Discord for issues:",
       issues.map((issue) => issue.title)
     );
-    await sendDiscordNotification(discordWebhookUrl, issues, repo, "issue", discordIDType, discordID);
+    await sendDiscordNotification(discordWebhookUrl, issues, repo, "issue", discordIDType, discordIDs);
   } else {
     throw new Error("Unsupported notifier. Use 'slack' or 'discord'.");
   }
diff --git a/action/monitor-new-pr.js b/action/monitor-new-pr.js
@@ -20,6 +20,7 @@ const fetchNewPRs = async (gitToken, owner, repo, alertTime) => {
 
   let newPRs = [];
   let page = 1;
+  let olderThanCutoff = false;
 
   try {
     while (true) {
@@ -32,10 +33,12 @@ const fetchNewPRs = async (gitToken, owner, repo, alertTime) => {
           page, // Current page of the results
         },
       });
-
       const recentPRs = response.data.filter((pr) => {
         const createdAt = new Date(pr.created_at);
         // Exclude PRs created by dependabot and older than the cutoff date
+        if (createdAt < new Date(cutoffDate)) {
+            olderThanCutoff = true;
+        }
         return (
           pr.user?.login !== "dependabot[bot]" &&
           createdAt >= new Date(cutoffDate)
@@ -53,6 +56,8 @@ const fetchNewPRs = async (gitToken, owner, repo, alertTime) => {
         }))
       );
 
+      if (olderThanCutoff) break;
+
       const hasNextPage = response.headers["link"]?.includes('rel="next"');
       if (!hasNextPage) break;
 
@@ -90,7 +95,7 @@ async function monitorPRs({
       slackToken,
       slackChannel,
       slackIDType,
-      slackID,
+      slackIDs,
     } = slackConfig;
     console.log(
       "🔔 Sending notifications to Slack for PRs:",
@@ -100,7 +105,7 @@ async function monitorPRs({
       slackToken,
       slackChannel,
       slackIDType,
-      slackID,
+      slackIDs,
       prs,
       repo,
       "pr"
@@ -109,13 +114,14 @@ async function monitorPRs({
     const {
       discordWebhookUrl,
       discordIDType,
-      discordID,
+      discordIDs,
     } = discordConfig;
+
     console.log(
       "🔔 Sending notifications to Discord for PRs:",
       prs.map((pr) => pr.title)
     );
-    await sendDiscordNotification(discordWebhookUrl, prs, repo, "pr", discordIDType, discordID);
+    await sendDiscordNotification(discordWebhookUrl, prs, repo, "pr", discordIDType, discordIDs);
   } else {
     throw new Error("Unsupported notifier. Use 'slack' or 'discord'.");
   }
diff --git a/action/utility/generatePayload.js b/action/utility/generatePayload.js
@@ -1,14 +1,42 @@
-function generateSlackPayload({ type, repo, issue, slackIDType, slackID }) {
+const generateSlackContent = (slackIDType, slackIDs) => {
+  let content = "";
+  let isAssignee = false;
+  if (slackIDType === "user") {
+    if (slackIDs) {
+      const slackIDsArray = slackIDs.split(",");
+      slackIDsArray.forEach(id => {
+        if (id.trim() !== "") {
+          isAssignee = true;
+          content += `<@${id.trim()}> `;
+        }
+      });
+      if (isAssignee) {
+        content = `*Assignee:* ` + content;
+      }
+    }
+  } else if (slackIDType === "group") {
+    if (slackIDs) {
+      const slackIDsArray = slackIDs.split(",");
+      slackIDsArray.forEach(id => {
+        if (id.trim() !== "") {
+          isAssignee = true;
+          content += `<!subteam^${id.trim()}> `;
+        }
+      });
+      if (isAssignee) {
+        content = `*Assignee:* ` + content;
+      }
+    }
+  }
+  return content;
+}
+
+function generateSlackPayload({ type, repo, issue, slackIDType, slackIDs }) {
   let assigneeText = "";
   const shouldDisplayAvatar = true;
 
   if (type === "issue") {
-    assigneeText =
-      slackIDType === "group"
-        ? `*Assignee:* <!subteam^${slackID}>`
-        : slackIDType === "user"
-        ? `*Assignee:* <@${slackID}>`
-        : "";
+    assigneeText = generateSlackContent(slackIDType, slackIDs);
 
     return {
       text: `📈 New Issue in ${repo}: ${issue.title}`, // Fallback text for notifications
@@ -75,12 +103,7 @@ function generateSlackPayload({ type, repo, issue, slackIDType, slackID }) {
       ],
     };
   } else if (type === "pr") {
-    assigneeText =
-      slackIDType === "group"
-        ? `*Reviewer:* <!subteam^${slackID}> `
-        : slackIDType === "user"
-        ? `*Reviewer:* <@${slackID}> `
-        : "";
+    assigneeText = generateSlackContent(slackIDType, slackIDs);
 
     return {
       text: `🚀 New Pull Request in ${repo}: ${issue.title}`, // Fallback text for notifications
@@ -153,22 +176,41 @@ function generateSlackPayload({ type, repo, issue, slackIDType, slackID }) {
   }
 }
 
+const generateDiscordContent = (discordIDType, discordIDs) => {
+  let content = "";
+  if (discordIDType === "user") {
+    if (discordIDs) { 
+      const discordIDsArray = discordIDs.split(",");
+      discordIDsArray.forEach(id => {
+        if (id.trim() !== "") {
+          content += `<@${id.trim()}> `;
+        }
+      });
+    }
+  } else if (discordIDType === "role") {
+    if (discordIDs) {
+      const discordIDsArray = discordIDs.split(",");
+      discordIDsArray.forEach(id => {
+        if (id.trim() !== "") {
+          content += `<@&${id.trim()}> `;
+        }
+      });
+    }
+  }
+  return content;
+}
+
+
 const generateDiscordPayload = ({
   type,
   repo,
   issue,
   discordIDType,
-  discordID,
+  discordIDs,
 }) => {
-  let content = "";
+  let content = generateDiscordContent(discordIDType, discordIDs);
   let message = "";
 
-  if (discordIDType === "user") {
-    content = `<@${discordID}>`;
-  } else if (discordIDType === "role") {
-    content = `<@&${discordID}>`;
-  }
-
   if (type === "issue") {
     message = {
       content: content,
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
