Merge pull request #20 from rpiambulance/dev

Fix #18
techinems · Oct 6, 2019 · 01787cf · 01787cf
2 parents 8af30c4 + b8aadde
commit 01787cf
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/handlers/buttons.js b/handlers/buttons.js
@@ -19,7 +19,7 @@ const approveMessage = (
   adminMessageTs,
   approver
 ) => {
-  postToChannel(channel_id, text, user_id);
+  postToChannel(channel_id, text, user_id, true);
   updateModMessage(
     "approved",
     channel_id,
@@ -30,6 +30,18 @@ const approveMessage = (
   );
 };
 
+const approveNoAt = (channel_id, text, user_id, adminMessageTs, approver) => {
+  postToChannel(channel_id, text, user_id, false);
+  updateModMessage(
+    "approved without at-channel",
+    channel_id,
+    text,
+    user_id,
+    adminMessageTs,
+    approver
+  );
+};
+
 const rejectMessage = (channel_id, text, user_id, adminMessageTs, rejector) => {
   updateModMessage(
     "rejected",
@@ -52,4 +64,4 @@ const cancelRequest = (channel_id, user_id, ts) => {
   });
 };
 
-module.exports = { approveMessage, rejectMessage, cancelRequest };
+module.exports = { approveMessage, approveNoAt, rejectMessage, cancelRequest };
diff --git a/handlers/message.js b/handlers/message.js
@@ -56,6 +56,14 @@ const sendForApproval = async (text, channel_id, user_id, hash) => {
             style: "primary",
             action_id: `APP_${hash}`
           },
+          {
+            type: "button",
+            text: {
+              type: "plain_text",
+              text: "Approve without @channel"
+            },
+            action_id: `NOAT_${hash}`
+          },
           {
             type: "button",
             text: {
@@ -72,7 +80,8 @@ const sendForApproval = async (text, channel_id, user_id, hash) => {
   return ts;
 };
 
-const postToChannel = (channel_id, text, user_id) => {
+const postToChannel = (channel_id, text, user_id, atChannel) => {
+  const atChannelText = atChannel ? "<!channel>" : "the channel";
   postMessage({
     token: TOKEN,
     channel: channel_id,
@@ -82,7 +91,7 @@ const postToChannel = (channel_id, text, user_id) => {
         type: "section",
         text: {
           type: "mrkdwn",
-          text: `<@${user_id}> has sent the following message to <!channel>:\n\n${text}`
+          text: `<@${user_id}> has sent the following message to ${atChannelText}:\n\n${text}`
         }
       }
     ]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "at-channel",
-  "version": "0.9.0",
+  "version": "1.1.0",
   "description": "Allows the approval of @channel requests in a slack workspace",
   "main": "server.js",
   "scripts": {

diff --git a/server.js b/server.js
@@ -7,6 +7,7 @@ const { isModerator } = require("./utilities/helperFunctions.js");
 const { slashChannel } = require("./handlers/slashCommands.js");
 const {
   approveMessage,
+  approveNoAt,
   rejectMessage,
   cancelRequest
 } = require("./handlers/buttons.js");
@@ -21,7 +22,8 @@ app.command(
 );
 
 app.action(
-  /^(APP|REJ)_.*/,
+  //APP = approved; NOAT = approved without @channel; REJ = reject
+  /^(APP|NOAT|REJ)_.*/,
   async ({ ack, next }) => {
     ack();
     next();
@@ -45,6 +47,8 @@ app.action(
       .replace(">", "");
     if (/^APP_.*/.test(action_id)) {
       approveMessage(channel_id, text, user_id, ts, id);
+    } else if (/^NOAT_.*/.test(action_id)) {
+      approveNoAt(channel_id, text, user_id, ts, id);
     } else if (/^REJ_.*/.test(action_id)) {
       rejectMessage(channel_id, text, user_id, ts, id);
     }

diff --git a/utilities/helperFunctions.js b/utilities/helperFunctions.js
@@ -78,8 +78,13 @@ const updateModMessage = (status, channel_id, text, user_id, ts, moderator) => {
     });
     return;
   }
-
-  const emoji = status == "approved" ? ":heavy_check_mark:" : ":x:";
+
+  const emoji =
+    status == "approved"
+      ? ":heavy_check_mark:"
+      : status == "approved without at-channel"
+      ? ":heavy_minus_sign:"
+      : ":x:";
   update({
     token: TOKEN,
     channel: MOD_CHANNEL_ID,
@@ -107,9 +112,9 @@ const updateModMessage = (status, channel_id, text, user_id, ts, moderator) => {
   });
 };
 
-const randomEmoji = (sentiment) => {
+const randomEmoji = sentiment => {
   let emojis = [];
-  switch(sentiment){
+  switch (sentiment) {
     case "happy":
       emojis = emojisList.happy;
       break;