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

escape history data, hide moderation note in api

Browse Source
This commit is contained in:
barisusakli
2016-09-30 18:42:19 +03:00
parent ce0fd95741
commit 15409f92cd
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/accounts/helpers.js
View File

@@ -87,6 +87,10 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData.ips = results.ips; userData.ips = results.ips;
} }
if (!isAdmin && !isGlobalModerator) {
userData.moderationNote = undefined;
}
userData.uid = userData.uid; userData.uid = userData.uid;
userData.yourid = callerUID; userData.yourid = callerUID;
userData.theirid = userData.uid; userData.theirid = userData.uid;
@@ -120,6 +124,7 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData.signature = validator.escape(String(userData.signature || '')); userData.signature = validator.escape(String(userData.signature || ''));
userData.aboutme = validator.escape(String(userData.aboutme || '')); userData.aboutme = validator.escape(String(userData.aboutme || ''));
userData.birthday = validator.escape(String(userData.birthday || '')); userData.birthday = validator.escape(String(userData.birthday || ''));
userData.moderationNote = validator.escape(String(userData.moderationNote || ''));
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid); userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%'; userData['cover:position'] = userData['cover:position'] || '50% 50%';

4
src/controllers/accounts/info.js
View File

@@ -22,8 +22,8 @@ infoController.get = function(req, res, callback) {
async.parallel({ async.parallel({
history: async.apply(user.getModerationHistory, userData.uid), history: async.apply(user.getModerationHistory, userData.uid),
sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID), sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID),
usernames: async.apply(user.getUsernameHistory, userData.uid), usernames: async.apply(user.getHistory, 'user:' + userData.uid + ':usernames'),
emails: async.apply(user.getEmailHistory, userData.uid) emails: async.apply(user.getHistory, 'user:' + userData.uid + ':emails')
}, next); }, next);
} }
], function(err, data) { ], function(err, data) {

2
src/middleware/header.js
View File

@@ -120,7 +120,7 @@ module.exports = function(middleware) {
results.user.isAdmin = results.isAdmin; results.user.isAdmin = results.isAdmin;
results.user.isGlobalMod = results.isGlobalMod; results.user.isGlobalMod = results.isGlobalMod;
results.user.uid = parseInt(results.user.uid, 10); results.user.uid = parseInt(results.user.uid, 10);
results.user.email = String(results.user.email).replace(/\\/g, '\\\\'); results.user.email = String(results.user.email).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1; results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1;
results.user.isEmailConfirmSent = !!results.isEmailConfirmSent; results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;

23
src/user/info.js
View File

@@ -61,24 +61,15 @@ module.exports = function(User) {
}); });
}; };
User.getEmailHistory = function(uid, callback) { User.getHistory = function(set, callback) {
db.getSortedSetRevRangeWithScores('user:' + uid + ':emails', 0, -1, function(err, data) { db.getSortedSetRevRangeWithScores(set, 0, -1, function(err, data) {
callback(err, data.map(function(set) { if (err) {
return callback(err);
}
callback(null, data.map(function(set) {
set.timestamp = set.score; set.timestamp = set.score;
set.timestampISO = new Date(set.score).toISOString(); set.timestampISO = new Date(set.score).toISOString();
set.value = set.value.split(':')[0]; set.value = validator.escape(String(set.value.split(':')[0]));
delete set.score;
return set;
}));
});
};
User.getUsernameHistory = function(uid, callback) {
db.getSortedSetRevRangeWithScores('user:' + uid + ':usernames', 0, -1, function(err, data) {
callback(err, data.map(function(set) {
set.timestamp = set.score;
set.timestampISO = new Date(set.score).toISOString();
set.value = set.value.split(':')[0];
delete set.score; delete set.score;
return set; return set;
})); }));