Merge pull request #47 from rpiambulance/fix-greater-less-amp

Fix &, <, and > replacement

package.json

@@ -25,6 +25,7 @@
     "@slack/web-api": "^5.2.1",
     "@types/dotenv": "^6.1.1",
     "@types/express": "^4.17.1",
+    "@types/node": "^13.7.0",
     "@types/qs": "^6.5.3",
     "body-parser": "^1.19.0",
     "dotenv": "^8.2.0",

src/Actions.ts

@@ -34,6 +34,8 @@ export class Actions {
     public onButtonAction(payload: any, res: (message: any) => Promise<unknown>): { text: string } {
         try {
             const poll = new Poll(payload.message.blocks);
+            payload.actions[0].text.text = payload.actions[0].text.text.replace("&lt;","<")
+                .replace("&gt;",">").replace("&amp;","&");
             poll.vote(payload.actions[0].text.text, payload.user.id);
             payload.message.blocks = poll.getBlocks();
             payload.message.text = "Vote changed!";

src/Poll.ts

@@ -44,9 +44,6 @@ export class Poll {
                 actionBlocks.push(newActionBlock);
                 actionBlockCount++;
             }
-            // Remove special characters, should be able to remove this once slack figures itself out
-            parameters[i] = parameters[i].replace("&", "+").replace(">", "greater than ")
-                .replace("<", "less than ");
             // We set value to empty string so that it is always defined
             const button: Button = { type: "button", value: " ", text: PollHelpers.buildTextElem(parameters[i]) };
             actionBlocks[actionBlockCount].elements.push(button);
@@ -149,6 +146,8 @@ export class Poll {
             for (let j = 0; j < currentBlock.elements.length; j++) {
                 if (currentBlock.elements[j].type !== "button") continue;
                 const button = currentBlock.elements[j] as Button;
+                button.text.text = button.text.text.replace("&lt;","<")
+                    .replace("&gt;",">").replace("&amp;","&");
                 if (buttonCallback(button)) break;
             }
         }
@@ -194,4 +193,4 @@ export class Poll {
         }
         return -1;
     }
-}
+}