Make commands channel agnostic and fix followers.js

Fixes Issue #4 and also stops Beastie from joining the teamTALIMA channel by default unless that is the configured broadcaster's username in /config/secrets.js
scryptonite · May 16, 2017 · 3353f4e · 3353f4e
1 parent 4be7ace
commit 3353f4e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/beastie-client.js b/beastie-client.js
@@ -14,7 +14,7 @@ const secrets = require("./config/secrets");
 var beastie = new tmi.client(
     _.defaults({
         identity: secrets.TTsBeastie,
-        channels: ["#teamTALIMA"]
+        channels: [secrets.broadcaster.username]
     },  require ("./config/config"))
 );
 

diff --git a/beastie-functions.js b/beastie-functions.js
@@ -1,6 +1,6 @@
 // TTsBeastie custom functions
 
-
+const secrets = require("./config/secrets");
 
 /**
  * CUSTOM TTsBEASTIE FUNCTIONS
@@ -24,10 +24,12 @@ module.exports.getArrayElement =    function(array){
                                     }
 
 module.exports.queryTwitchAPI =     function(queryUrl){
-                                        url: "https://api.twitch.tv/kraken/" + queryUrl,
-                                        headers: {
-                                            "Accept": "application/vnd.twitchtv.v5+json",
-                                            "Authorization": "OAuth " + secrets.broadcaster.password,
-                                            "Client-ID": secrets.clientId
-                                        }
+                                        return {
+                                            url: "https://api.twitch.tv/kraken/" + queryUrl,
+                                            headers: {
+                                                "Accept": "application/vnd.twitchtv.v5+json",
+                                                "Authorization": "OAuth " + secrets.broadcaster.password,
+                                                "Client-ID": secrets.clientId
+                                            }
+                                        };
                                     }
diff --git a/commands/commands.js b/commands/commands.js
@@ -115,7 +115,7 @@ var commands = {
                                         var minutes = Math.floor(diff / 60) % 60;
                                         var seconds = Math.floor(diff - (hours * 60 * 60) - (minutes * 60));
 
-                                        queue.addMessage( channel, "teamTALIMA has been LIVE for: " + hours + " hours " + minutes + " minutes " + seconds + " seconds. rawr");
+                                        queue.addMessage( channel, secrets.broadcaster.username + " has been LIVE for: " + hours + " hours " + minutes + " minutes " + seconds + " seconds. rawr");
                                     }
                                 });
                             }

diff --git a/events/followers.js b/events/followers.js
@@ -4,6 +4,7 @@
 
 // Setup Files
 const beastie = require("../beastie-client");
+const beastieFunctions = require("../beastie-functions");
 const secrets = require("../config/secrets");
 
 // array of new followers which need to be acknowledged