Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 15:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into socket.io1.x

Browse Source
This commit is contained in:
barisusakli
2014-11-28 14:36:01 -05:00
parent c213f77f91 b8845181f6
commit 49a73e1665
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket.io/meta.js
View File

@@ -5,6 +5,7 @@ var nconf = require('nconf'),
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);

4
src/user.js
View File

@@ -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);
}
};