From 2366e2b2096ef369ba4e46a887a267b33661b05f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 22 Sep 2013 13:28:10 -0400 Subject: [PATCH] refactored get_latest_undeleted_pid to not blindly call getPostsByTid in order to determine post deletion. (issue #320) --- src/threadTools.js | 19 +------------------ src/webserver.js | 1 - 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/threadTools.js b/src/threadTools.js index 83925dcd2a..697b8d5a74 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -301,33 +301,16 @@ var RDB = require('./redis.js'), RDB.lrange('tid:' + tid + ':posts', 0, -1, function(err, pids) { if (pids.length === 0) return callback(new Error('no-undeleted-pids-found')); - console.log(tid, pids); pids.reverse(); async.detectSeries(pids, function(pid, next) { RDB.hget('post:' + pid, 'deleted', function(err, deleted) { - if (deleted === '1') next(true); + if (deleted === '0') next(true); else next(false); }); }, function(pid) { - // console.log(pid); if (pid) callback(null, pid); else callback(new Error('no-undeleted-pids-found')); }); }); - // posts.getPostsByTid(tid, 0, -1, function(posts) { - // var numPosts = posts.length; - // if (!numPosts) - // return callback(new Error('no-undeleted-pids-found')); - - // while (numPosts--) { - // if (posts[numPosts].deleted !== '1') { - // console.log(posts[numPosts].pid); - // callback(null, posts[numPosts].pid); - // return; - // } - // } - - // callback(new Error('no-undeleted-pids-found')); - // }); } }(exports)); \ No newline at end of file diff --git a/src/webserver.js b/src/webserver.js index 83bf304ad1..24bea4de72 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -514,7 +514,6 @@ var express = require('express'), }); }); }); - }(WebServer));