mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-11 16:35:47 +01:00
partially fixed acp active users
This commit is contained in:
@@ -17,8 +17,8 @@ define(function() {
|
|||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
Admin.updateRoomUsage = function(data) {
|
Admin.updateRoomUsage = function(err, data) {
|
||||||
console.log('room usage updating', data);
|
console.log(arguments);
|
||||||
var active_users = document.getElementById('active_users'),
|
var active_users = document.getElementById('active_users'),
|
||||||
total = 0;
|
total = 0;
|
||||||
active_users.innerHTML = '';
|
active_users.innerHTML = '';
|
||||||
|
|||||||
@@ -72,13 +72,13 @@ SocketMeta.rooms.enter = function(socket, data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
socket.join(data.enter);
|
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) {
|
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) {
|
if (data.leave && server.rooms[data.leave] && server.rooms[data.leave][socket.id] && data.enter !== data.leave) {
|
||||||
delete socket.manager.rooms[data.leave][socket.id];
|
delete server.rooms[data.leave][socket.id];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,12 +89,12 @@ SocketMeta.rooms.enter = function(socket, data) {
|
|||||||
module.parent.exports.updateRoomBrowsingText(data.enter);
|
module.parent.exports.updateRoomBrowsingText(data.enter);
|
||||||
|
|
||||||
if (data.enter != 'admin') {
|
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) {
|
SocketMeta.rooms.getAll = function(socket, data, callback) {
|
||||||
callback(socket.manager.rooms);
|
callback(null, server.rooms);
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Exports */
|
/* Exports */
|
||||||
|
|||||||
Reference in New Issue
Block a user