Text button type added.

Author: jg

lib/interactive/api-buttons/apiProcessor.js

@@ -25,29 +25,28 @@ function apiProcessor(report){
         var buttonID = button['id'];
         var typeSettings = button['typeSettings'];
         var apiType = typeSettings['apiType'];
-		var sendAs = typeSettings['sendAs'];
-		var chatter = sendAs+'Chat';
-
-				if(apiType == "Advice"){
-					randomAdvice(chatter);
-				} else if (apiType == "Cat Picture"){
-					randomCat(chatter);
-				} else if (apiType == "Cat Fact"){
-					randomCatFact(chatter);
-				} else if (apiType == "Dog Picture"){
-					randomDog(chatter);
-				} else if (apiType == "Dog Fact"){
-					randomDogFact(chatter);
-				} else if (apiType == "Aww"){
-					randomAww(chatter);
-				} else if (apiType == "Pokemon"){
-					randomPokemon(chatter);
-				} else if (apiType == "Number Trivia"){
-					numberTrivia(chatter);
-				}
-    } else if (holding > 0){
-			errorLog.log('API Buttons should only have pressFrequency on in the dev lab.');
+		var chatter = typeSettings['sendAs'];
+
+		if(apiType == "Advice"){
+			randomAdvice(chatter);
+		} else if (apiType == "Cat Picture"){
+			randomCat(chatter);
+		} else if (apiType == "Cat Fact"){
+			randomCatFact(chatter);
+		} else if (apiType == "Dog Picture"){
+			randomDog(chatter);
+		} else if (apiType == "Dog Fact"){
+			randomDogFact(chatter);
+		} else if (apiType == "Aww"){
+			randomAww(chatter);
+		} else if (apiType == "Pokemon"){
+			randomPokemon(chatter);
+		} else if (apiType == "Number Trivia"){
+			numberTrivia(chatter);
 		}
+    } else if (holding > 0){
+		errorLog.log('API Buttons should only have pressFrequency on in the dev lab.');
+	}
 }
 
 function randomAdvice(chatter){

lib/interactive/chat-connect.js

@@ -128,7 +128,7 @@ function createBotChatSocket (chatter, userId, channelId, endpoints, authkey) {
     // Handle errors
     global.chat.on('error', error => {
         // Popup error.
-        errorLog.log('There was an error with the chat socket. (chat-connect)')
+        errorLog.log('There was an error with the chat socket for '+chatter+'. (chat-connect)')
         // Send error message to gui
         renderWindow.webContents.send('chat-disconnect');
         console.error('Socket error', error);
@@ -157,19 +157,26 @@ function chatDisconnect(){
 // Send a whisper to a specific person from whoever the chatter is (streamer or bot).
 function whisper(chatter, username, message){
      var chat = chatter+'Chat';
-	 global.chat.call('whisper', [username, message]);
+     try{
+         global.chat.call('whisper', [username, message]);
+     }catch(err){
+        errorLog.log('There was an error sending your message from '+chatter+'. (chat-connect)');
+     }
+	 
 }
 
 // Broadcast
 // Send a broadcast to the channel from whoever the chatter is (streamer or bot).
 function broadcast(chatter, message){
     var chat = chatter+'Chat';
-	global.chat.call('msg', [message]);
+    try{
+        global.chat.call('msg', [message]);
+    } catch(err){
+        errorLog.log('There was an error sending your message from '+chatter+'. (chat-connect)');
+    }
 }
 
 
-
-
 // Export Functions
 exports.connect = chatConnect;
 exports.disconnect = chatDisconnect;

lib/interactive/controls-router.js

@@ -11,6 +11,9 @@ const soundBoard = require('./soundboard/soundProcessor.js');
 // API Processor
 const apiButtons = require('./api-buttons/apiProcessor.js');
 
+// Text Processor
+const textButtons = require('./text-buttons/textProcessor.js');
+
 // Progress Processors
 const progressReport = require('./progress-reports/progressProcessor.js');
 
@@ -60,8 +63,10 @@ function reportHandler(report) {
                 gameTactile.tactile(buttonReport);
             } else if (buttonType == "Sound"){
                 soundBoard.play(buttonReport);
-            } else if ("API Buttons"){
+            } else if (buttonType == "Api Buttons"){
                 apiButtons.play(buttonReport);
+            } else if (buttonType == "Text Buttons"){
+                textButtons.play(buttonReport);
             }
 
         } else {

lib/interactive/text-buttons/textProcessor.js

@@ -0,0 +1,44 @@
+const JsonDB = require('node-json-db');
+const chat = require('../chat-connect.js');
+const errorLog = require('../../error-logging/error-logging.js')
+
+function textProcessor(report){
+    var dbSettings = new JsonDB('./user-settings/settings', true, false);
+    var activeProfile = dbSettings.getData('./interactive/activeBoard');
+
+    var dbControls = new JsonDB('./user-settings/controls/' + activeProfile, true, false);
+	var controls = dbControls.getData('/tactile');
+
+    // Get report info
+    var rawid = report.id;
+    var holding = report.holding;
+    var press = report.pressFrequency;
+    var button = controls[rawid];
+
+    if(press > 0){
+
+        // Get user specific settings
+        var buttonID = button['id'];
+        var typeSettings = button['typeSettings'];
+        var textLine = typeSettings['textLine'];
+		var sendAs = typeSettings['sendAs'];
+        var whisperTo = typeSettings['whisperTo'];
+
+        if(whisperTo !== "" && whisperTo !== undefined && whisperTo !== null){
+            // Send a whisper
+            console.log('sending text', sendAs, whisperTo, textLine);
+            chat.whisper(sendAs, whisperTo, textLine);
+        } else {
+            // Send a broadcast
+            console.log('sending broadcast', sendAs, textLine);
+            chat.broadcast(sendAs, textLine);
+        }
+
+    } else if (holding > 0){
+        errorLog.log('Text Buttons should only have pressFrequency on in the dev lab.');
+    }
+}
+
+
+// Export Functions
+exports.play = textProcessor;