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

makes recent unread and category pages a lot faster, added logging when a user changes their username

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-13 18:02:06 -05:00
parent c07bf466b2
commit a97ee201d8
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/events.js
View File

@@ -21,6 +21,10 @@ var fs = require('fs'),
log(uid,'changed email from "' + oldEmail + '" to "' + newEmail +'"'); log(uid,'changed email from "' + oldEmail + '" to "' + newEmail +'"');
} }
events.logUsernameChange = function(uid, oldUsername, newUsername) {
log(uid,'changed username from "' + oldUsername + '" to "' + newUsername +'"');
}
events.logAdminLogin = function(uid) { events.logAdminLogin = function(uid) {
log(uid, 'logged into admin panel'); log(uid, 'logged into admin panel');
} }

9
src/threadTools.js
View File

@@ -285,7 +285,7 @@ var winston = require('winston'),
} }
ThreadTools.getLatestUndeletedPid = function(tid, callback) { ThreadTools.getLatestUndeletedPid = function(tid, callback) {
db.getSortedSetRange('tid:' + tid + ':posts', 0, -1, function(err, pids) { db.getSortedSetRevRange('tid:' + tid + ':posts', 0, -1, function(err, pids) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
@@ -293,14 +293,9 @@ var winston = require('winston'),
return callback(new Error('no-undeleted-pids-found')); return callback(new Error('no-undeleted-pids-found'));
} }
pids.reverse();
async.detectSeries(pids, function(pid, next) { async.detectSeries(pids, function(pid, next) {
posts.getPostField(pid, 'deleted', function(err, deleted) { posts.getPostField(pid, 'deleted', function(err, deleted) {
if (parseInt(deleted, 10) === 0) { next(parseInt(deleted, 10) === 0);
next(true);
} else {
next(false);
}
}); });
}, function(pid) { }, function(pid) {
if (pid) { if (pid) {

27
src/topics.js
View File

@@ -982,7 +982,7 @@ var async = require('async'),
return callback(err, null); return callback(err, null);
} }
posts.getPostFields(pid, ['pid', 'content', 'uid', 'timestamp'], function(err, postData) { posts.getPostFields(pid, ['pid', 'uid', 'timestamp'], function(err, postData) {
if (err) { if (err) {
return callback(err, null); return callback(err, null);
} else if(!postData) { } else if(!postData) {
@@ -994,26 +994,13 @@ var async = require('async'),
return callback(err, null); return callback(err, null);
} }
var stripped = postData.content, callback(null, {
timestamp = postData.timestamp, pid: postData.pid,
returnObj = { username: userData.username || 'anonymous',
"pid": postData.pid, userslug: userData.userslug,
"username": userData.username || 'anonymous', picture: userData.picture || gravatar.url('', {}, https = nconf.get('https')),
"userslug": userData.userslug, timestamp: postData.timestamp
"picture": userData.picture || gravatar.url('', {}, https = nconf.get('https')),
"timestamp": timestamp
};
if (postData.content) {
stripped = postData.content.replace(/>.+\n\n/, '');
postTools.parse(stripped, function(err, stripped) {
returnObj.text = S(stripped).stripTags().s;
callback(null, returnObj);
}); });
} else {
returnObj.text = '';
callback(null, returnObj);
}
}); });
}); });
}); });

1
src/user.js
View File

@@ -312,6 +312,7 @@ var bcrypt = require('bcrypt'),
db.searchRemove('user', uid, function() { db.searchRemove('user', uid, function() {
db.searchIndex('user', data.username, uid); db.searchIndex('user', data.username, uid);
}); });
events.logUsernameChange(uid, userData.username, data.username);
} }
if(userslug !== userData.userslug) { if(userslug !== userData.userslug) {