From c7a218af9ae41ece30148420dcbc9a9fb4d96633 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 15 Jul 2013 14:34:15 -0400
Subject: [PATCH] closes #80

---
 src/categories.js |  6 +++++-
 src/posts.js      | 32 ++++++++++++++++----------------
 src/topics.js     |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index a88c79a1d2..5f04069fe1 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -282,13 +282,17 @@ var	RDB = require('./redis.js'),
 	}
 
 	Categories.getRecentReplies = function(cid, count, callback) {
-		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, count-1, function(err, pids) {
+		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, (count<10)?10:count, function(err, pids) {
 
 			if (pids.length == 0) {
 				callback([]);
 				return;
 			}
+
 			posts.getPostSummaryByPids(pids, function(posts) {
+				if(posts.length > count) {
+					posts = posts.slice(0, count);
+				}
 				callback(posts);
 			});
 		});
diff --git a/src/posts.js b/src/posts.js
index 1a9e7940ca..38dfac0581 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -57,24 +57,24 @@ marked.setOptions({
 		
 		var returnData = [];
 		
-		var loaded = 0;
-						
-		for(var i=0, ii=pids.length; i<ii; ++i) {
-			
-			(function(index, pid) {
-				Posts.getPostFields(pids[i], ['pid', 'content', 'uid', 'timestamp'], function(postData) {
-					Posts.addUserInfoToPost(postData, function() {
-						
-						returnData[index] = postData;
-						++loaded;
-						
-						if(loaded === pids.length) {
-							callback(returnData);		
-						}				
-					});
+		function getPostSummary(pid, callback) {
+			Posts.getPostFields(pid, ['pid', 'content', 'uid', 'timestamp', 'deleted'], function(postData) {
+				Posts.addUserInfoToPost(postData, function() {
+
+					if(postData.deleted !== '1')	{
+						returnData.push(postData);
+					}
+					
+					callback(null);
 				});
-			}(i, pids[i]));
+			});
 		}
+		
+		async.eachSeries(pids, getPostSummary, function(err) {
+			if(!err) {
+				callback(returnData);
+			}
+		});
 	};
 
 	Posts.getPostData = function(pid, callback) {
diff --git a/src/topics.js b/src/topics.js
index 760c12e609..c353074bf8 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -305,7 +305,7 @@ marked.setOptions({
 
 	Topics.getTeaser = function(tid, callback) {
 		Topics.get_latest_undeleted_pid(tid, function(pid) {
-			console.log(pid);
+
 			if (pid !== null) {
 				
 				posts.getPostFields(pid, ['content', 'uid', 'timestamp'], function(postData) {