Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 16:27:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5005 from yariplus/patch-12

Browse Source 
modifyUserData does not check for offline status.
This commit is contained in:
Barış Soner Uşaklı
2016-09-02 11:43:28 +03:00
committed by GitHub
parent c9c60ef8ed 247db79d57
commit e497882242
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/user/data.js
View File

@@ -50,6 +50,10 @@ module.exports = function(User) {
addField('uploadedpicture');
}
if (fields.indexOf('status') !== -1) {
addField('lastonline');
}
db.getObjectsFields(keys, fields, function(err, users) {
if (err) {
return callback(err);
@@ -117,6 +121,10 @@ module.exports = function(User) {
user.uploadedpicture = user.uploadedpicture.startsWith('http') ? user.uploadedpicture : nconf.get('relative_path') + user.uploadedpicture;
}
if (user.hasOwnProperty('status') && parseInt(user.lastonline, 10)) {
user.status = User.getStatus(user);
}
for(var i=0; i<fieldsToRemove.length; ++i) {
user[fieldsToRemove[i]] = undefined;
}
@@ -183,4 +191,4 @@ module.exports = function(User) {
});
};
};
};