Fix issue where any redemption would cause a swap

alexjpaz-twitch · Jan 21, 2021 · 55f7fb9 · 55f7fb9
1 parent 93534a5
commit 55f7fb9
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 16 deletions.
diff --git a/src/twitch.js b/src/twitch.js
@@ -5,19 +5,17 @@ const config = require('./config');
 
 const ComfyJS = require("comfy.js");
 
-const chatCommandRegExp = new RegExp(config.chatCommand);
-
-const chatListCommandRegExp = new RegExp(config.chatListCommand);
-
-const rewardNameRegExp = new RegExp(config.rewardNameRegExp);
-
 class TwitchShufflerListener {
   constructor(props = {}) {
     this.swap = props.swap;
 
     this.list = props.list;
 
     this.lastCommandTimestamps = {};
+
+    this.chatCommand = props.chatCommand || config.chatCommand;
+    this.redemptionName = props.redemptionName || config.redemptionName;
+    this.chatListCommand = props.chatListCommand || config.chatListCommand;
   }
 
   async say(text) {
@@ -50,24 +48,36 @@ class TwitchShufflerListener {
   }
 
   async onCommand( user, command, message, flags, extra ) {
-    if(chatCommandRegExp.test(command)) {
-      const isCoolingDown = this.isCoolingDown(user, command, message, flags, extra);
+    if(this.chatCommand) {
+      const chatCommandRegExp = new RegExp(this.chatCommand);
+
+      if(chatCommandRegExp.test(command)) {
+        const isCoolingDown = this.isCoolingDown(user, command, message, flags, extra);
 
-      if(!isCoolingDown) {
-        this.lastCommandTimestamps['$$global$$'] = new Date().getTime();
-        this.lastCommandTimestamps[user] = new Date().getTime();
-        this.swap(message, `${user} via command`);
+        if(!isCoolingDown) {
+          this.lastCommandTimestamps['$$global$$'] = new Date().getTime();
+          this.lastCommandTimestamps[user] = new Date().getTime();
+          this.swap(message, `${user} via command`);
+        }
       }
     }
 
-    if(chatListCommandRegExp.test(command)) {
-      this.say(await this.list(message));
+    if(this.chatListCommand) {
+      const chatListCommandRegExp = new RegExp(this.chatListCommand);
+
+      if(chatListCommandRegExp.test(command)) {
+        this.say(await this.list(message));
+      }
     }
   }
 
   async onReward( user, reward, cost, extra ) {
-    if(rewardNameRegExp.test(reward)) {
-      this.swap(extra, `${user} via reward`);
+    if(this.redemptionName) {
+      const matchesRemption = new RegExp(this.redemptionName).test(reward);
+
+      if(matchesRemption) {
+        this.swap(extra, `${user} via reward`);
+      }
     }
   }
 

diff --git a/src/twitch.spec.js b/src/twitch.spec.js
@@ -92,6 +92,20 @@ describe('twitch', () => {
       expect(listener.swap.called).to.eql(true);
       expect(listener.swap.calledWith("fake_message")).to.eql(true);
     });
+
+    it('should NOT swap on invalid swap redemption', () => {
+      listener.swap = sinon.spy();
+
+      listener.onReward(
+        "fake_user",
+        "__INVALID__", // TODO
+        -1,
+        "fake_message"
+      );
+
+      expect(listener.swap.called).to.eql(false);
+      expect(listener.swap.calledWith("fake_message")).to.eql(false);
+    });
   });
 
   describe('cooldown', () => {