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

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) {
function reIndex(pid, callback) {
function reIndex(pid, next) {
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) {
db.searchIndex('post', content, pid);
}
callback(null);
next();
});
});
}
async.each(pids, reIndex, function(err) {
if (err) {
callback(err, null);
} else {
callback(null, 'Posts reindexed');
}
});
async.each(pids, reIndex, callback);
}
Posts.getFavourites = function(uid, callback) {

155
src/topics.js
View File

@@ -53,7 +53,6 @@ var async = require('async'),
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.incrObjectField('category:' + cid, 'topic_count');
db.incrObjectField('global', 'topicCount');
@@ -66,25 +65,14 @@ var async = require('async'),
};
Topics.post = function(uid, title, content, cid, callback) {
categoryTools.privileges(cid, uid, function(err, privileges) {
if(err) {
return callback(err);
} else if(!privileges.write) {
return callback(new Error('no-privileges'));
} else if (!cid) {
return callback(new Error('invalid-cid'));
}
if (title) {
title = title.trim();
}
if (!title || title.length < parseInt(meta.config.minimumTitleLength, 10)) {
return callback(new Error('title-too-short'), null);
return callback(new Error('title-too-short'));
} else if(title.length > parseInt(meta.config.maximumTitleLength, 10)) {
return callback(new Error('title-too-long'), null);
return callback(new Error('title-too-long'));
}
if (content) {
@@ -92,49 +80,50 @@ var async = require('async'),
}
if (!content || content.length < meta.config.miminumPostLength) {
return callback(new Error('content-too-short'), null);
return callback(new Error('content-too-short'));
}
user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
if (err) {
return callback(err);
if (!cid) {
return callback(new Error('invalid-cid'));
}
if(!lastposttime) {
lastposttime = 0;
async.waterfall([
function(next) {
categoryTools.privileges(cid, uid, next);
},
function(privileges, next) {
if(!privileges.write) {
return next(new Error('no-privileges'));
}
if (Date.now() - lastposttime < meta.config.postDelay * 1000) {
return callback(new Error('too-many-posts'), null);
}
Topics.create(uid, title, cid, function(err, tid) {
next();
},
function(next) {
user.isReadyToPost(uid, next);
},
function(next) {
Topics.create(uid, title, cid, next);
},
function(tid, next) {
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) {
return callback(err);
return next(err);
}
Topics.reply(tid, uid, content, function(err, postData) {
if(err) {
return callback(err, null);
} 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, {
next(null, {
topicData: topicData,
postData: postData
});
});
});
});
});
});
}
], callback);
};
Topics.reply = function(tid, uid, content, callback) {
@@ -152,18 +141,7 @@ var async = require('async'),
next();
},
function(next) {
user.getUserField(uid, 'lastposttime', 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();
user.isReadyToPost(uid, next);
},
function(next) {
if (content) {
@@ -235,17 +213,15 @@ var async = require('async'),
pids.sort();
var mainPid = pids[0];
posts.getPostData(mainPid, function(err, postData) {
if(err) {
return callback(err);
async.parallel({
postData: function(callback) {
posts.getPostData(mainPid, callback);
},
cid: function(callback) {
posts.getCidByPid(mainPid, callback);
}
posts.getCidByPid(mainPid, function(err, cid) {
if(err) {
return callback(err);
}
Topics.create(postData.uid, title, cid, function(err, tid) {
}, function(err, results) {
Topics.create(results.postData.uid, title, results.cid, function(err, tid) {
if(err) {
return callback(err);
}
@@ -255,13 +231,15 @@ var async = require('async'),
return callback(err);
}
Topics.getTopicData(tid, function(err, topicData) {
callback(err, topicData);
});
Topics.getTopicData(tid, callback);
});
function move(pid, next) {
postTools.privileges(pid, uid, function(err, privileges) {
if(err) {
return next(err);
}
if(privileges.editable) {
Topics.movePostToTopic(pid, tid, next);
} else {
@@ -271,7 +249,6 @@ var async = require('async'),
}
});
});
});
}
Topics.movePostToTopic = function(pid, tid, callback) {
@@ -418,6 +395,10 @@ var async = require('async'),
Topics.getCategoryData = function(tid, callback) {
Topics.getTopicField(tid, 'cid', function(err, cid) {
if(err) {
callback(err);
}
categories.getCategoryData(cid, callback);
});
}
@@ -838,15 +819,12 @@ var async = require('async'),
}
function getTeaser(next) {
Topics.getTeaser(tid, function(err, teaser) {
if (err) teaser = {};
next(null, teaser);
});
Topics.getTeaser(tid, next);
}
async.parallel([getTopicData, getReadStatus, getTeaser], function(err, results) {
if (err) {
throw new Error(err);
return callback(err);
}
var topicData = results[0],
@@ -863,7 +841,7 @@ var async = require('async'),
topicData.teaser_timestamp = utils.toISOString(teaser.timestamp);
topicData.teaser_userpicture = teaser.picture;
callback(topicData);
callback(null, topicData);
});
}
@@ -1151,33 +1129,20 @@ var async = require('async'),
Topics.reIndexTopic = function(tid, callback) {
Topics.getPids(tid, function(err, pids) {
if (err) {
callback(err);
} else {
posts.reIndexPids(pids, function(err) {
if (err) {
callback(err);
} else {
callback(null);
}
});
return callback(err);
}
posts.reIndexPids(pids, callback);
});
}
Topics.reIndexAll = function(callback) {
db.getSetMembers('topics:tid', function(err, tids) {
if (err) {
callback(err, null);
} else {
return callback(err);
}
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) {
db.isObjectField('email:uid', email, function(err, exists) {
callback(err, !exists);