Added dance command

app.js

@@ -4,15 +4,13 @@ var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
 var sassMiddleware = require('node-sass-middleware');
-var socketApi = require('./socketApi')
 
 var indexRouter = require('./routes/index');
 var animationStateRouter = require('./routes/animationState');
 var animationStateData = {};
 
 // Create instance of Express and Socket.io
 var app = express();
-io = socketApi.io;
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -59,9 +57,10 @@ const animationStateUpdater = () => {
         animationStateData = data;
         console.log(animationStateData);
         animationStateRouter.setCurrentState(animationStateData);
-        io.emit('speech', animationStateData);
     }
     setTimeout(animationStateUpdater, 100);
 }; animationStateUpdater();
 
+
+
 module.exports = app;

includes/_tmiAPI.js

@@ -12,11 +12,18 @@ const timeout = 1000 * 60 * 5;
 
 // Function to greet a user when the send the first message in the chat and start a timeout timer
 function greet (target, user) {
+    let newData = {};
+    newData.sent = Date.now();
     const username = user.username;
     logIt(`Greet Triggered with username: ${username}`);
     tmiAPI.say(target,`Greetings ${username}, welcome to the channel`);
+    newData.command = 'greet';
+    newData.user = username;
     activeUser[username] = true;
     activeTimeout = setTimeout (timeoutFunc, timeout, username);
+    if (newData !== null) {
+        tmiData = newData;
+    }
 }
 
 // Function to reset the status of a user based on chat activity
@@ -62,6 +69,7 @@ tmiAPI.on('message', (target, context, msg, self) => {
                     if (speech.length > 0) {
                         newData.command = "talk";
                         newData.speech = speech;
+                        newData.user = username;
                     } else {
                         newData = null;
                     }
@@ -78,6 +86,10 @@ tmiAPI.on('message', (target, context, msg, self) => {
                         newData = null;
                     }
                     break;
+                case (command.startsWith('!dance')):
+                    console.log('dance');
+                    newData.command = 'dance';
+                    break;
                 default:
                     newData = null;
             }

public/js/speech.js

@@ -1,8 +1,44 @@
 // Connect to websocket
 var socket = io.connect('http://localhost:1337');
 
+socket.on('connect', () => {
+    console.log(socket.id, 'connected');
+});
+
 // Display content in speech bubble when websocket sends data
-socket.on('speech', (data) => {
+socket.on('talk', (data) => {
+    $(".bubble").text(data.user + ' says: ' + data.speech).show(150);
+    setTimeout(() => {
+        $(".bubble").text('');
+        $(".bubble").hide(150);
+    }, 5000)
+    console.log(data);
+});
+
+socket.on('dice', (data) => {
+
+    $(".bubble").text('You rolled a ' + data.result + ' on your D' + data.sides).show(150);
+    setTimeout(() => {
+        $(".bubble").text('');
+        $(".bubble").hide(150);
+    }, 5000)
+    console.log(data);
+});
+
+socket.on('greet', (data) => {
+    $(".bubble").text('Welcome ' + data.user).show(150);
+    setTimeout(() => {
+        $(".bubble").text('');
+        $(".bubble").hide(150);
+    }, 5000)
+    console.log(data);
+});
+
+socket.on('dance', (data) => {
     $(".bubble").hide();
-    $(".bubble").text(data.speech).show(150);
+    $(".fett").css("background-image", "url(../images/cuteslime.gif)");
+    setTimeout(() => {
+        $(".fett").css("background-image", "url(../images/boba-fett.gif)");
+    }, 3500);
+    console.log(data);
 });

public/stylesheets/style.scss

@@ -23,7 +23,7 @@ body  {
 
     .fett {
         width: 150px; height: 150px;
-        background-image: url(../images/boba-fett.gif);
+        background: url(../images/boba-fett.gif);
         background-size: contain;
         background-repeat: no-repeat;
         position: absolute;

socketApi.js

@@ -4,8 +4,24 @@ var socketApi = {};
 
 socketApi.io = io;
 
+var animationStateData = {};
+
+const tmi = require('./includes/_tmiAPI.js');
+
 io.on('connection', (socket) => {
     console.log('New connection with ID:', socket.id);
+
+    const animationStateUpdater = () => {
+        let data = tmi.getCurrentState();
+        if (data !== animationStateData) {
+            animationStateData = data;
+            console.log(animationStateData, 'on web socket', socket.id);
+            if (typeof animationStateData.command !== "undefined") {
+                io.emit(animationStateData.command, animationStateData);
+            }
+        }
+        setTimeout(animationStateUpdater, 100);
+    }; animationStateUpdater();    
 });
 
 module.exports = socketApi;