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

closes #5975

Browse Source
This commit is contained in:
Baris Usakli
2017-10-12 13:54:53 -04:00
parent 500c978a26
commit 68bcfb2883
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/middleware/header.js
View File

@@ -82,6 +82,7 @@ module.exports = function (middleware) {
uid: 0, uid: 0,
username: '[[global:guest]]', username: '[[global:guest]]',
userslug: '', userslug: '',
fullname: '[[global:guest]]',
email: '', email: '',
picture: user.getDefaultAvatar(), picture: user.getDefaultAvatar(),
status: 'offline', status: 'offline',

19
src/posts/user.js
View File

@@ -12,12 +12,21 @@ module.exports = function (Posts) {
Posts.getUserInfoForPosts = function (uids, uid, callback) { Posts.getUserInfoForPosts = function (uids, uid, callback) {
var groupsMap = {}; var groupsMap = {};
var userData; var userData;
var userSettings;
async.waterfall([ async.waterfall([
function (next) { function (next) {
user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status', 'lastonline', 'groupTitle'], next); async.parallel({
userData: function (next) {
user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status', 'lastonline', 'groupTitle'], next);
},
userSettings: function (next) {
user.getMultipleUserSettings(uids, next);
},
}, next);
}, },
function (_userData, next) { function (results, next) {
userData = _userData; userData = results.userData;
userSettings = results.userSettings;
var groupTitles = userData.map(function (userData) { var groupTitles = userData.map(function (userData) {
return userData && userData.groupTitle; return userData && userData.groupTitle;
}).filter(function (groupTitle, index, array) { }).filter(function (groupTitle, index, array) {
@@ -38,7 +47,7 @@ module.exports = function (Posts) {
} }
}); });
userData.forEach(function (userData) { userData.forEach(function (userData, index) {
userData.uid = userData.uid || 0; userData.uid = userData.uid || 0;
userData.username = userData.username || '[[global:guest]]'; userData.username = userData.username || '[[global:guest]]';
userData.userslug = userData.userslug || ''; userData.userslug = userData.userslug || '';
@@ -48,7 +57,7 @@ module.exports = function (Posts) {
userData.picture = userData.picture || ''; userData.picture = userData.picture || '';
userData.status = user.getStatus(userData); userData.status = user.getStatus(userData);
userData.signature = validator.escape(String(userData.signature || '')); userData.signature = validator.escape(String(userData.signature || ''));
userData.fullname = validator.escape(String(userData.fullname || '')); userData.fullname = userSettings[index].showfullname ? validator.escape(String(userData.fullname || '')) : undefined;
if (parseInt(meta.config.hideFullname, 10) === 1) { if (parseInt(meta.config.hideFullname, 10) === 1) {
userData.fullname = undefined; userData.fullname = undefined;
} }

11
src/topics.js
View File

@@ -115,6 +115,9 @@ Topics.getTopicsByTids = function (tids, uid, callback) {
users: function (next) { users: function (next) {
user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next); user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next);
}, },
userSettings: function (next) {
user.getMultipleUserSettings(uids, next);
},
categories: function (next) { categories: function (next) {
categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'image', 'bgColor', 'color', 'disabled'], next); categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'image', 'bgColor', 'color', 'disabled'], next);
}, },
@@ -136,11 +139,11 @@ Topics.getTopicsByTids = function (tids, uid, callback) {
}, next); }, next);
}, },
function (results, next) { function (results, next) {
if (parseInt(meta.config.hideFullname, 10) === 1) { results.users.forEach(function (user, index) {
results.users.forEach(function (user) { if (parseInt(meta.config.hideFullname, 10) === 1 || !results.userSettings[index].showfullname) {
user.fullname = undefined; user.fullname = undefined;
}); }
} });
var users = _.zipObject(uids, results.users); var users = _.zipObject(uids, results.users);
var categories = _.zipObject(cids, results.categories); var categories = _.zipObject(cids, results.categories);

2
src/user/settings.js
View File

@@ -12,7 +12,7 @@ var pubsub = require('../pubsub');
var LRU = require('lru-cache'); var LRU = require('lru-cache');
var cache = LRU({ var cache = LRU({
max: 1000, max: 2000,
length: function () { return 1; }, length: function () { return 1; },
maxAge: 1000 * 60 * 60, maxAge: 1000 * 60 * 60,
}); });