From 3177fdfa74c82c6fcf7be0e2a3662a7259fe7126 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 16 Jan 2014 16:26:47 -0500
Subject: [PATCH] partially fixed acp active users
---
public/src/forum/admin/index.js | 4 ++--
src/socket.io/meta.js | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js
index 78a24f17d4..f5a1125cfa 100644
--- a/public/src/forum/admin/index.js
+++ b/public/src/forum/admin/index.js
@@ -17,8 +17,8 @@ define(function() {
})
};
- Admin.updateRoomUsage = function(data) {
- console.log('room usage updating', data);
+ Admin.updateRoomUsage = function(err, data) {
+ console.log(arguments);
var active_users = document.getElementById('active_users'),
total = 0;
active_users.innerHTML = '';
diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index 1b2f49b792..f07b079cef 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -72,13 +72,13 @@ SocketMeta.rooms.enter = function(socket, data) {
}
socket.join(data.enter);
- socket.manager.rooms[data.enter] = socket.manager.rooms[data.enter] || {};
+ server.rooms[data.enter] = server.rooms[data.enter] || {};
if (socket.uid) {
- socket.manager.rooms[data.enter][socket.id] = socket.uid;
+ server.rooms[data.enter][socket.id] = socket.uid;
- if (data.leave && socket.manager.rooms[data.leave] && socket.manager.rooms[data.leave][socket.id] && data.enter !== data.leave) {
- delete socket.manager.rooms[data.leave][socket.id];
+ if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
+ delete server.rooms[data.leave][socket.id];
}
}
@@ -89,12 +89,12 @@ SocketMeta.rooms.enter = function(socket, data) {
module.parent.exports.updateRoomBrowsingText(data.enter);
if (data.enter != 'admin') {
- server.in('admin').emit('event:meta.rooms.update', socket.manager.rooms);
+ server.in('admin').emit('event:meta.rooms.update', server.rooms);
}
};
SocketMeta.rooms.getAll = function(socket, data, callback) {
- callback(socket.manager.rooms);
+ callback(null, server.rooms);
};
/* Exports */