From e0a5fa48f431d142987811a7b0c583d0214b3913 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 28 Jun 2017 11:33:03 -0400
Subject: [PATCH] add default webcam_stream and adjust emoji

---
 .../2.0/users/server/handlers/userJoined.js   | 32 +------------------
 .../api/2.0/users/server/modifiers/addUser.js |  4 +--
 .../imports/startup/server/redis.js           |  2 +-
 .../imports/startup/server/redis2x.js         |  3 +-
 4 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/userJoined.js b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/userJoined.js
index a70b3ce4e3..51df4926fc 100644
--- a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/userJoined.js
+++ b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/userJoined.js
@@ -1,40 +1,10 @@
 import { check } from 'meteor/check';
 import addUser from '../modifiers/addUser';
 
-/*{
-  "envelope": {
-    "name": "UserJoinedMeetingEvtMsg",
-    "routing": {
-      "msgType": "BROADCAST_TO_MEETING",
-      "meetingId": "183f0bf3a0982a127bdb8161e0c44eb696b3e75c-1498049295768",
-      "userId": "w_sbqdhyjw7a2w"
-    }
-  },
-  "core": {
-    "header": {
-      "name": "UserJoinedMeetingEvtMsg",
-      "meetingId": "183f0bf3a0982a127bdb8161e0c44eb696b3e75c-1498049295768",
-      "userId": "w_sbqdhyjw7a2w"
-    },
-    "body": {
-      "intId": "w_sbqdhyjw7a2w",
-      "extId": "w_sbqdhyjw7a2w",
-      "name": "user2",
-      "role": "MODERATOR",
-      "guest": false,
-      "authed": false,
-      "waitingForAcceptance": false,
-      "emoji": "none",
-      "presenter": false,
-      "locked": false,
-      "avatar": "http://10.30.10.214/client/avatar.png"
-    }
-  }
-}*/
 export default function handleUserJoined({ header, body }) {
   const meetingId = header.meetingId;
   const user = body;
-  
+
   check(meetingId, String);
   check(user, Object);
 
diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/addUser.js b/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/addUser.js
index 7f76481941..334395d2b5 100644
--- a/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/addUser.js
+++ b/bigbluebutton-html5/imports/api/2.0/users/server/modifiers/addUser.js
@@ -52,14 +52,14 @@ export default function addUser(meetingId, user) {
       'user.avatarURL': user.avatar,
       'user.set_emoji_time': user.set_emoji_time || (new Date()).getTime(),
       'user.joiningTime': (new Date()).getTime(),
-      'user.emoji_status': user.emoji_status,
+      'user.emoji_status': user.emoji,
       'user.presenter': user.presenter,
       'user.locked': user.locked,
       'user.listenOnly': user.listenOnly,
 
       // default values for voiceUser and webcam
+      'user.webcam_stream': [],
       'user.voiceUser.web_userid': false,
-      'user.voiceUser.webcam_stream': [],
       'user.voiceUser.callernum': false,
       'user.voiceUser.userid': false,
       'user.voiceUser.talking': false,
diff --git a/bigbluebutton-html5/imports/startup/server/redis.js b/bigbluebutton-html5/imports/startup/server/redis.js
index 2dbb5e819d..6f7f53eab0 100755
--- a/bigbluebutton-html5/imports/startup/server/redis.js
+++ b/bigbluebutton-html5/imports/startup/server/redis.js
@@ -65,7 +65,7 @@ class RedisPubSub {
   }
 
   handleMessage(pattern, channel, message = '') {
-    console.log(' 1.1: ' + message);
+    console.log(` 1.1: ${message}`);
     try {
       message = JSON.parse(message);
     } catch (e) {}
diff --git a/bigbluebutton-html5/imports/startup/server/redis2x.js b/bigbluebutton-html5/imports/startup/server/redis2x.js
index a1fa77fc5b..5f61903ebb 100644
--- a/bigbluebutton-html5/imports/startup/server/redis2x.js
+++ b/bigbluebutton-html5/imports/startup/server/redis2x.js
@@ -131,4 +131,5 @@ Meteor.startup(() => {
   RedisPubSubSingleton.init();
 });
 
-export default RedisPubSubSingleton;
\ No newline at end of file
+export default RedisPubSubSingleton;
+