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

closes #1412

Browse Source
This commit is contained in:
barisusakli
2014-04-20 15:07:53 -04:00
parent e86d2d72c6
commit 2ad715ead3
8 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/topics.js
View File

@@ -61,22 +61,9 @@ var async = require('async'),
return callback(err || new Error('[[error:no-topic]]'));
}
user.getUserFields(topic.uid, ['username', 'userslug', 'picture'] , function(err, userData) {
if (err) {
return callback(err);
}
if (!userData) {
userData = {};
}
topic.user = {
username: userData.username || 'Anonymous',
userslug: userData.userslug || '',
picture: userData.picture || gravatar.url('', {}, true)
};
callback(null, topic);
user.getNameSlugPicture(topic.uid, function(err, userData) {
topic.user = userData;
callback(err, topic);
});
});
};
@@ -219,7 +206,8 @@ var async = require('async'),
if (userCache[topicData.uid]) {
return next(null, userCache[topicData.uid]);
}
user.getUserFields(topicData.uid, ['username', 'userslug', 'picture'], next);
user.getNameSlugPicture(topicData.uid, next);
}
}, function(err, topicInfo) {
if(err) {
@@ -332,18 +320,13 @@ var async = require('async'),
return callback(new Error('[[error:no-teaser]]'));
}
user.getUserFields(postData.uid, ['username', 'userslug', 'picture'], function(err, userData) {
user.getNameSlugPicture(postData.uid, function(err, userData) {
if (err) {
return callback(err);
}
callback(null, {
pid: postData.pid,
username: userData.username || 'anonymous',
userslug: userData.userslug || '',
picture: userData.picture || gravatar.url('', {}, true),
timestamp: utils.toISOString(postData.timestamp)
});
postData.timestamp = utils.toISOString(postData.timestamp);
postData.user = userData;
callback(null, postData);
});
});
});