people join and leave rooms

Author: Connoropolous

lib/app.js

@@ -261,6 +261,16 @@ C("app", "require exports module ChatView smallSurface auth createRooms localVid
         app.globalChat.removeParticipant(profile.username);
       }
     });
+    socket.on('presence_room', function(presence) {
+      if (rooms[presence.room_id]) {
+        rooms[presence.room_id].room.chat.addParticipant(presence.profile);
+      }
+    });
+    socket.on('vacated_room', function(presence) {
+      if (rooms[presence.room_id]) {
+        rooms[presence.room_id].room.chat.removeParticipant(presence.profile.username);
+      }
+    });
 
     socket.on('users_count', function(count) {
       app.stats.activePeople = count;
@@ -305,12 +315,12 @@ C("app", "require exports module ChatView smallSurface auth createRooms localVid
             // random position for now
             var top = Math.floor((Math.random() * ($target.height() - 100)) + 1);
             //var left = Math.floor((Math.random() * ($target.width() - 100)) + 1);
-            var left = Math.floor((Math.random() * (468 - 100)) + 1);
+            var right = Math.floor((Math.random() * (468 - 100)) + 1);
             v.setParent($target);
             $target.append(v.$container);
             v.$container.css({
                 top: top + 'px',
-                left: left + 'px'
+                right: right + 'px'
             });
           }
 

serve-development/js/junto.js

@@ -30397,6 +30397,16 @@ C("app", "require exports module ChatView smallSurface auth createRooms localVid
         app.globalChat.removeParticipant(profile.username);
       }
     });
+    socket.on('presence_room', function(presence) {
+      if (rooms[presence.room_id]) {
+        rooms[presence.room_id].room.chat.addParticipant(presence.profile);
+      }
+    });
+    socket.on('vacated_room', function(presence) {
+      if (rooms[presence.room_id]) {
+        rooms[presence.room_id].room.chat.removeParticipant(presence.profile.username);
+      }
+    });
 
     socket.on('users_count', function(count) {
       app.stats.activePeople = count;
@@ -30441,12 +30451,12 @@ C("app", "require exports module ChatView smallSurface auth createRooms localVid
             // random position for now
             var top = Math.floor((Math.random() * ($target.height() - 100)) + 1);
             //var left = Math.floor((Math.random() * ($target.width() - 100)) + 1);
-            var left = Math.floor((Math.random() * (468 - 100)) + 1);
+            var right = Math.floor((Math.random() * (468 - 100)) + 1);
             v.setParent($target);
             $target.append(v.$container);
             v.$container.css({
                 top: top + 'px',
-                left: left + 'px'
+                right: right + 'px'
             });
           }
 

serve-production/js/junto.js

@@ -30488,7 +30488,6 @@ C("app", "require exports module ChatView smallSurface auth createRooms localVid
         });
         app.globalChat = new ChatView(app.globalMessages, mapper, 'global');
         var cHeight = jQuery('body').height() - 98 - 50 - 50 - 166 - 16; // input : header : header : participants : padding
-        console.log(cHeight);
         app.globalChat.$messages.height(cHeight);
         jQuery('body').append(app.globalChat.$container);
         app.globalChat.close();

server/rtcSignalServer.js

@@ -89,6 +89,12 @@ module.exports = function(io, stunservers) {
                     room_id: client.room,
                     count: io.sockets.clients(client.room).length
                 });
+                if (client.profile) {
+                    client.broadcast.emit('vacated_room', {
+                        room_id: client.room,
+                        profile: client.profile
+                    });
+                }
                 if (io.sockets.clients(client.room).length == 0) {
                     delete activeRooms[client.room];
                     io.sockets.emit('rooms_count', Object.keys(activeRooms).length);
@@ -110,6 +116,20 @@ module.exports = function(io, stunservers) {
                 room_id: name,
                 count: io.sockets.clients(name).length
             });
+            if (client.profile) {
+                client.broadcast.emit('presence_room', {
+                    room_id: name,
+                    profile: client.profile
+                });
+            }
+            io.sockets.clients(name).forEach(function (s) {
+                if (s.profile) {
+                    client.emit('presence_room', {
+                        room_id: name,
+                        profile: s.profile
+                    });
+                }
+            });
             client.room = name;
             activeRooms[name] = true;
             io.sockets.emit('rooms_count', Object.keys(activeRooms).length);