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

style changes

Browse Source
This commit is contained in:
barisusakli
2016-05-19 16:07:19 +03:00
parent b56baf2530
commit 3f0ca31393
2 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/topics.js
View File

@@ -339,84 +339,75 @@ var social = require('./social');
db.getSortedSetRangeWithScores(['tid:' + tid + ':bookmarks'], 0, -1, callback ); db.getSortedSetRangeWithScores(['tid:' + tid + ':bookmarks'], 0, -1, callback );
}; };
Topics.updateTopicBookmarks = function( tid, pids, callback ){ Topics.updateTopicBookmarks = function(tid, pids, callback) {
var maxIndex; var maxIndex;
var Posts = posts;
async.waterfall([ async.waterfall([
function(next){ function(next) {
Topics.getPostCount( tid, next ); Topics.getPostCount(tid, next);
}, },
function(postcount, next){ function(postcount, next) {
maxIndex = postcount; maxIndex = postcount;
Topics.getTopicBookmarks( tid, next ); Topics.getTopicBookmarks(tid, next);
}, },
function(bookmarks, next){ function(bookmarks, next) {
var uids = bookmarks.map( function( bookmark ){return bookmark.value}); var forkedPosts = pids.map(function(pid) {
var forkedPosts = pids.map( function( pid ){ return { pid: pid, tid: tid }; } ); return {pid: pid, tid: tid};
var uidBookmark = new Object(); });
var uidData = bookmarks.map(
function( bookmark ){ var uidData = bookmarks.map(function(bookmark) {
var u = new Object(); return {
u.uid = bookmark.value; uid: bookmark.value,
u.bookmark = bookmark.score; bookmark: bookmark.score
return u; };
} ); });
async.map(
uidData, async.map(uidData, function(data, mapCallback) {
function( data, mapCallback ){ posts.getPostIndices(forkedPosts, data.uid, function(err, indices) {
Posts.getPostIndices( if (err) {
forkedPosts, return callback(err);
data.uid,
function( err, indices ){
if( err ){
callback( err );
} }
data.postIndices = indices; data.postIndices = indices;
mapCallback( null, data ); mapCallback(null, data);
} ) });
}, }, function(err, results) {
function( err, results ){ if (err) {
if( err ){ return callback(err);
return callback();
} }
async.map( async.map(results, function(data, mapCallback) {
results,
function( data, mapCallback ){
var uid = data.uid; var uid = data.uid;
var bookmark = data.bookmark; var bookmark = data.bookmark;
bookmark = bookmark < maxIndex ? bookmark : maxIndex; bookmark = bookmark < maxIndex ? bookmark : maxIndex;
var postIndices = data.postIndices; var postIndices = data.postIndices;
var i;
for( i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i ){ for (var i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i ){
--bookmark; --bookmark;
} }
if( bookmark != data.bookmark ){ if (parseInt(bookmark, 10) !== parseInt(data.bookmark, 10)) {
mapCallback( null, { uid: uid, bookmark: bookmark } ); mapCallback( null, { uid: uid, bookmark: bookmark } );
} } else {
else{
mapCallback( null, null ); mapCallback( null, null );
} }
}, }, function(err, results) {
function( err, results ){ if (err) {
async.map( results, return callback(err);
function(ui, cb ){
if( ui && ui.bookmark){
Topics.setUserBookmark( tid, ui.uid, ui.bookmark, cb );
} }
else{
return cb( null, null ); async.map(results, function(ui, cb) {
if( ui && ui.bookmark) {
Topics.setUserBookmark(tid, ui.uid, ui.bookmark, cb);
} else {
return cb(null, null);
} }
}, }, function(err) {
function( err, results ){ next(err);
next(); });
});
});
} }
); ], function(err){
} callback(err);
); });
}
);
}],
function( err, result ){ callback();} );
}; };
}(exports)); }(exports));

2
src/topics/fork.js
View File

@@ -55,7 +55,7 @@ module.exports = function(Topics) {
} }
Topics.create({uid: results.postData.uid, title: title, cid: cid}, next); Topics.create({uid: results.postData.uid, title: title, cid: cid}, next);
}, },
function( results, next) { function(results, next) {
Topics.updateTopicBookmarks(fromTid, pids, function(){ next( null, results );} ); Topics.updateTopicBookmarks(fromTid, pids, function(){ next( null, results );} );
}, },
function(_tid, next) { function(_tid, next) {