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

reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!

Browse Source
This commit is contained in:
Julian Lam
2014-01-24 13:09:44 -05:00
parent be86f84ef8
commit a3fe390810
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/user.js
View File

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