diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index d483591f65..b09490763d 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -4,7 +4,8 @@ var nconf = require('nconf'), gravatar = require('gravatar'), winston = require('winston'), validator = require('validator'), - + + db = require('../database'), meta = require('../meta'), user = require('../user'), topics = require('../topics'), @@ -86,6 +87,7 @@ SocketMeta.rooms.enter = function(socket, data, callback) { }; SocketMeta.rooms.getAll = function(socket, data, callback) { + var now = Date.now(); db.sortedSetCount('users:online', now - 300000, now, function(err, onlineRegisteredCount) { if (err) { return callback(err); diff --git a/src/user.js b/src/user.js index efdcb618fe..72694e8bfe 100644 --- a/src/user.js +++ b/src/user.js @@ -191,9 +191,9 @@ var async = require('async'), if (set === 'users:online') { var count = parseInt(stop, 10) === -1 ? stop : stop - start + 1; var now = Date.now(); - db.getSortedSetRevRangeByScore(set, start, count, now, now - 300000, next); + db.getSortedSetRevRangeByScore(set, start, count, now, now - 300000, callback); } else { - db.getSortedSetRevRange(set, start, stop, next); + db.getSortedSetRevRange(set, start, stop, callback); } };