Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-02 20:59:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
This commit is contained in:
Julian Lam
2014-01-25 20:42:37 -05:00
parent a240fc81ce 6628db89af
commit 197b7f2a6c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/user.js
View File

@@ -489,13 +489,13 @@ var bcrypt = require('bcrypt'),
User.search = function(query, callback) {
if (!query || query.length === 0) {
return callback(null, []);
return callback(null, {timing:0, users:[]});
}
var start = process.hrtime();
db.getObject('username:uid', function(err, usernamesHash) {
if (err) {
return callback(null, []);
return callback(null, {timing: 0, users:[]});
}
query = query.toLowerCase();
@@ -515,7 +515,9 @@ var bcrypt = require('bcrypt'),
});
User.getDataForUsers(results, function(userdata) {
callback(null, userdata);
var diff = process.hrtime(start);
var timing = (diff[0] * 1e3 + diff[1] / 1e6).toFixed(1);
callback(null, {timing: timing, users: userdata});
});
});
};