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

lots of cleanup and refactor

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-23 19:01:30 -05:00
parent f62c82c797
commit b0ef974590
3 changed files with 107 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/posts.js
View File

@@ -439,26 +439,23 @@ var db = require('./database'),
Posts.reIndexPids = function(pids, callback) { Posts.reIndexPids = function(pids, callback) {
function reIndex(pid, callback) { function reIndex(pid, next) {
Posts.getPostField(pid, 'content', function(err, content) { Posts.getPostField(pid, 'content', function(err, content) {
db.searchRemove('post', pid, function() { if(err) {
return next(err);
}
db.searchRemove('post', pid, function() {
if (content && content.length) { if (content && content.length) {
db.searchIndex('post', content, pid); db.searchIndex('post', content, pid);
} }
callback(null); next();
}); });
}); });
} }
async.each(pids, reIndex, function(err) { async.each(pids, reIndex, callback);
if (err) {
callback(err, null);
} else {
callback(null, 'Posts reindexed');
}
});
} }
Posts.getFavourites = function(uid, callback) { Posts.getFavourites = function(uid, callback) {

201
src/topics.js
View File

@@ -53,7 +53,6 @@ var async = require('async'),
user.addTopicIdToUser(uid, tid, timestamp); user.addTopicIdToUser(uid, tid, timestamp);
// in future it may be possible to add topics to several categories, so leaving the door open here.
db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid); db.sortedSetAdd('categories:' + cid + ':tid', timestamp, tid);
db.incrObjectField('category:' + cid, 'topic_count'); db.incrObjectField('category:' + cid, 'topic_count');
db.incrObjectField('global', 'topicCount'); db.incrObjectField('global', 'topicCount');
@@ -66,75 +65,65 @@ var async = require('async'),
}; };
Topics.post = function(uid, title, content, cid, callback) { Topics.post = function(uid, title, content, cid, callback) {
if (title) {
title = title.trim();
}
categoryTools.privileges(cid, uid, function(err, privileges) { if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
return callback(new Error('title-too-short'));
} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
return callback(new Error('title-too-long'));
}
if(err) { if (content) {
return callback(err); content = content.trim();
} else if(!privileges.write) { }
return callback(new Error('no-privileges'));
} else if (!cid) {
return callback(new Error('invalid-cid'));
}
if (title) { if (!content || content.length < meta.config.miminumPostLength) {
title = title.trim(); return callback(new Error('content-too-short'));
} }
if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) { if (!cid) {
return callback(new Error('title-too-short'), null); return callback(new Error('invalid-cid'));
} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) { }
return callback(new Error('title-too-long'), null);
}
if (content) { async.waterfall([
content = content.trim(); function(next) {
} categoryTools.privileges(cid, uid, next);
},
if (!content || content.length < meta.config.miminumPostLength) { function(privileges, next) {
return callback(new Error('content-too-short'), null); if(!privileges.write) {
} return next(new Error('no-privileges'));
user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
if (err) {
return callback(err);
} }
next();
if(!lastposttime) { },
lastposttime = 0; function(next) {
} user.isReadyToPost(uid, next);
},
if (Date.now() - lastposttime < meta.config.postDelay * 1000) { function(next) {
return callback(new Error('too-many-posts'), null); Topics.create(uid, title, cid, next);
} },
function(tid, next) {
Topics.create(uid, title, cid, function(err, tid) { Topics.reply(tid, uid, content, next);
},
function(postData, next) {
threadTools.toggleFollow(postData.tid, uid);
next(null, postData);
},
function(postData, next) {
Topics.getTopicForCategoryView(postData.tid, uid, function(err, topicData) {
if(err) { if(err) {
return callback(err); return next(err);
} }
Topics.reply(tid, uid, content, function(err, postData) { topicData.unreplied = 1;
next(null, {
if(err) { topicData: topicData,
return callback(err, null); postData: postData
} else if(!postData) {
return callback(new Error('invalid-post'), null);
}
threadTools.toggleFollow(tid, uid);
Topics.getTopicForCategoryView(tid, uid, function(topicData) {
topicData.unreplied = 1;
callback(null, {
topicData: topicData,
postData: postData
});
});
}); });
}); });
}); }
}); ], callback);
}; };
Topics.reply = function(tid, uid, content, callback) { Topics.reply = function(tid, uid, content, callback) {
@@ -152,18 +141,7 @@ var async = require('async'),
next(); next();
}, },
function(next) { function(next) {
user.getUserField(uid, 'lastposttime', next); user.isReadyToPost(uid, next);
},
function(lastposttime, next) {
if(!lastposttime) {
lastposttime = 0;
}
if (Date.now() - parseInt(lastposttime, 10) < parseInt(meta.config.postDelay, 10) * 1000) {
return next(new Error('too-many-posts'), null);
}
next();
}, },
function(next) { function(next) {
if (content) { if (content) {
@@ -235,41 +213,40 @@ var async = require('async'),
pids.sort(); pids.sort();
var mainPid = pids[0]; var mainPid = pids[0];
posts.getPostData(mainPid, function(err, postData) { async.parallel({
if(err) { postData: function(callback) {
return callback(err); posts.getPostData(mainPid, callback);
},
cid: function(callback) {
posts.getCidByPid(mainPid, callback);
} }
}, function(err, results) {
posts.getCidByPid(mainPid, function(err, cid) { Topics.create(results.postData.uid, title, results.cid, function(err, tid) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
Topics.create(postData.uid, title, cid, function(err, tid) { async.eachSeries(pids, move, function(err) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
async.eachSeries(pids, move, function(err) { Topics.getTopicData(tid, callback);
});
function move(pid, next) {
postTools.privileges(pid, uid, function(err, privileges) {
if(err) { if(err) {
return callback(err); return next(err);
} }
Topics.getTopicData(tid, function(err, topicData) { if(privileges.editable) {
callback(err, topicData); Topics.movePostToTopic(pid, tid, next);
}); } else {
next();
}
}); });
}
function move(pid, next) {
postTools.privileges(pid, uid, function(err, privileges) {
if(privileges.editable) {
Topics.movePostToTopic(pid, tid, next);
} else {
next();
}
});
}
});
}); });
}); });
} }
@@ -418,6 +395,10 @@ var async = require('async'),
Topics.getCategoryData = function(tid, callback) { Topics.getCategoryData = function(tid, callback) {
Topics.getTopicField(tid, 'cid', function(err, cid) { Topics.getTopicField(tid, 'cid', function(err, cid) {
if(err) {
callback(err);
}
categories.getCategoryData(cid, callback); categories.getCategoryData(cid, callback);
}); });
} }
@@ -838,15 +819,12 @@ var async = require('async'),
} }
function getTeaser(next) { function getTeaser(next) {
Topics.getTeaser(tid, function(err, teaser) { Topics.getTeaser(tid, next);
if (err) teaser = {};
next(null, teaser);
});
} }
async.parallel([getTopicData, getReadStatus, getTeaser], function(err, results) { async.parallel([getTopicData, getReadStatus, getTeaser], function(err, results) {
if (err) { if (err) {
throw new Error(err); return callback(err);
} }
var topicData = results[0], var topicData = results[0],
@@ -863,7 +841,7 @@ var async = require('async'),
topicData.teaser_timestamp = utils.toISOString(teaser.timestamp); topicData.teaser_timestamp = utils.toISOString(teaser.timestamp);
topicData.teaser_userpicture = teaser.picture; topicData.teaser_userpicture = teaser.picture;
callback(topicData); callback(null, topicData);
}); });
} }
@@ -1151,33 +1129,20 @@ var async = require('async'),
Topics.reIndexTopic = function(tid, callback) { Topics.reIndexTopic = function(tid, callback) {
Topics.getPids(tid, function(err, pids) { Topics.getPids(tid, function(err, pids) {
if (err) { if (err) {
callback(err); return callback(err);
} else {
posts.reIndexPids(pids, function(err) {
if (err) {
callback(err);
} else {
callback(null);
}
});
} }
posts.reIndexPids(pids, callback);
}); });
} }
Topics.reIndexAll = function(callback) { Topics.reIndexAll = function(callback) {
db.getSetMembers('topics:tid', function(err, tids) { db.getSetMembers('topics:tid', function(err, tids) {
if (err) { if (err) {
callback(err, null); return callback(err);
} else {
async.each(tids, Topics.reIndexTopic, function(err) {
if (err) {
callback(err, null);
} else {
callback(null, 'All topics reindexed.');
}
});
} }
async.each(tids, Topics.reIndexTopic, callback);
}); });
} }

17
src/user.js
View File

@@ -348,6 +348,23 @@ var bcrypt = require('bcrypt'),
} }
}; };
User.isReadyToPost = function(uid, callback) {
User.getUserField(uid, 'lastposttime', function(err, lastposttime) {
if(err) {
return callback(err);
}
if(!lastposttime) {
lastposttime = 0;
}
if (Date.now() - parseInt(lastposttime, 10) < parseInt(meta.config.postDelay, 10) * 1000) {
return callback(new Error('too-many-posts'));
}
callback();
});
}
User.isEmailAvailable = function(email, callback) { User.isEmailAvailable = function(email, callback) {
db.isObjectField('email:uid', email, function(err, exists) { db.isObjectField('email:uid', email, function(err, exists) {
callback(err, !exists); callback(err, !exists);