started integrating infinite post loading for topic view (re: issue #42)

public/src/forum/topic.js

@@ -312,10 +312,9 @@
 			.append(html)
 			.fadeIn('slow');
 
-		socket.once('api:post.privileges', function(privileges) {
+		for(var x=0,numPosts=data.posts.length;x<numPosts;x++) {
-			if (privileges.editable) toggle_mod_tools(data.posts[0].pid, true);
+			socket.emit('api:post.privileges', data.posts[x].pid);
-		});
+		}
-		socket.emit('api:post.privileges', data.posts[0].pid);
 
 		set_up_posts(uniqueid);
 		
@@ -397,6 +396,10 @@
 		if (data.pid) toggle_post_delete_state(data.pid, true);
 	});
 
+	socket.on('api:post.privileges', function(privileges) {
+		if (privileges.editable) toggle_mod_tools(privileges.pid, true);
+	});
+
 	function adjust_rep(value, pid, uid) {
 		var post_rep = jQuery('.post_rep_' + pid),
 			user_rep = jQuery('.user_rep_' + uid);

src/postTools.js

@@ -4,7 +4,8 @@ var	RDB = require('./redis.js'),
 	threadTools = require('./threadTools.js'),
 	user = require('./user.js'),
 	async = require('async'),
-	marked = require('marked');
+	marked = require('marked'),
+	utils = require('../public/src/utils');
 
 marked.setOptions({
 	breaks: true
@@ -115,4 +116,65 @@ marked.setOptions({
 		});
 	}
 
+	PostTools.constructPostObject = function(rawPosts, tid, current_user, privileges, callback) {
+		var postObj = [];
+
+		async.waterfall([
+			function(next) {
+				if (!privileges) {
+					threadTools.privileges(tid, current_user, function(privs) {
+						privileges = privs;
+						next();
+					});
+				} else {
+					next();
+				}
+			},
+			function(next) {
+				var postData = rawPosts.postData,
+					userData = rawPosts.userData,
+					voteData = rawPosts.voteData;
+
+				if (!postData) {
+					return next(null, []);
+				}
+
+				for (var i=0, ii= postData.pid.length; i<ii; i++) {
+					var uid = postData.uid[i],
+						pid = postData.pid[i];
+					
+					// ############ to be moved into posts.getPostsByTid ############
+					if (postData.deleted[i] === null || (postData.deleted[i] === '1' && privileges.view_deleted) || current_user === uid) {
+						var post_obj = {
+							'pid' : pid,
+							'uid' : uid,
+							'content' : marked(postData.content[i] || ''),
+							'post_rep' : postData.reputation[i] || 0,
+							'timestamp' : postData.timestamp[i],
+							'relativeTime': utils.relativeTime(postData.timestamp[i]),
+							'username' : userData[uid].username || 'anonymous',
+							'userslug' : userData[uid].userslug || '',
+							'user_rep' : userData[uid].reputation || 0,
+							'gravatar' : userData[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
+							'signature' : marked(userData[uid].signature || ''),
+							'fav_star_class' : voteData[pid] ? 'icon-star' : 'icon-star-empty',
+							'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
+							'edited-class': postData.editor[i] !== null ? '' : 'none',
+							'editor': postData.editor[i] !== null ? userData[postData.editor[i]].username : '',
+							'relativeEditTime': postData.editTime !== null ? utils.relativeTime(postData.editTime[i]) : '',
+							'deleted': postData.deleted[i] || '0'
+						};
+
+						postObj.push(post_obj);
+					}
+					// ########## end to be moved into posts.getPostsByTid ############
+				}
+
+				next(null);
+			}
+		], function(err) {
+			callback(postObj);
+		});
+	}
+
 }(exports));

src/posts.js

@@ -26,10 +26,7 @@ marked.setOptions({
 
 			Posts.getPostsByPids(pids, current_user, function(posts) {
 				callback(posts);
-			})
+			});
-			
-			
-
 		});
 	}
 

src/topics.js

@@ -7,6 +7,7 @@ var	RDB = require('./redis.js')
 	posts = require('./posts.js'),
 	marked = require('marked'),
 	threadTools = require('./threadTools.js'),
+	postTools = require('./postTools'),
 	async = require('async'),
 	feed = require('./feed.js');
 
@@ -39,7 +40,7 @@ marked.setOptions({
 		}
 
 		function getTopicPosts(next) {
-			posts.getPostsByTid(tid, current_user, 0, 10, function(postData) {
+			posts.getPostsByTid(tid, current_user, 0, 9, function(postData) {
 				next(null, postData);
 			});
 		}
@@ -51,69 +52,30 @@ marked.setOptions({
 		}
 
 		async.parallel([getTopicData, getTopicPosts, getPrivileges], function(err, results) {
-			var	retrieved_posts = [],
-			main_posts = [];
-
 			var topicData = results[0],
-				postData = results[1].postData,
-				userData = results[1].userData,
-				voteData = results[1].voteData,
 				privileges = results[2];
 
-			if (!postData) {
+			postTools.constructPostObject(results[1], tid, current_user, privileges, function(postObj) {
-				callback(false);
+				if (postObj.length) {
-				return;
+					var	main_posts = postObj.splice(0, 1);
-			}
+
-
+					callback({
-			for (var i=0, ii= postData.pid.length; i<ii; i++) {
+						'topic_name':topicData.topic_name,
-				var uid = postData.uid[i],
+						'category_name':topicData.category_name,
-					pid = postData.pid[i];
+						'category_slug':topicData.category_slug,
-				
+						'locked': parseInt(topicData.locked) || 0,
-				// ############ to be moved into posts.getPostsByTid ############
+						'deleted': parseInt(topicData.deleted) || 0,
-				if (postData.deleted[i] === null || (postData.deleted[i] === '1' && privileges.view_deleted) || current_user === uid) {
+						'pinned': parseInt(topicData.pinned) || 0,
-					var post_obj = {
+						'slug': topicData.slug,
-						'pid' : pid,
+						'topic_id': tid,
-						'uid' : uid,
+						'expose_tools': privileges.editable ? 1 : 0,
-						'content' : marked(postData.content[i] || ''),
+						'posts': postObj,
-						'post_rep' : postData.reputation[i] || 0,
+						'main_posts': main_posts
-						'timestamp' : postData.timestamp[i],
+					});
-						'relativeTime': utils.relativeTime(postData.timestamp[i]),
+				} else {
-						'username' : userData[uid].username || 'anonymous',
+					return callback(false);
-						'userslug' : userData[uid].userslug || '',
-						'user_rep' : userData[uid].reputation || 0,
-						'gravatar' : userData[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
-						'signature' : marked(userData[uid].signature || ''),
-						'fav_star_class' : voteData[pid] ? 'icon-star' : 'icon-star-empty',
-						'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
-						'edited-class': postData.editor[i] !== null ? '' : 'none',
-						'editor': postData.editor[i] !== null ? userData[postData.editor[i]].username : '',
-						'relativeEditTime': postData.editTime !== null ? utils.relativeTime(postData.editTime[i]) : '',
-						'deleted': postData.deleted[i] || '0'
-					};
-
-					if (i == 0) {
-						main_posts.push(post_obj);
-					} else {
-						retrieved_posts.push(post_obj);
-					}
 				}
-				// ########## end to be moved into posts.getPostsByTid ############
-			}
-
-			callback({
-				'topic_name':topicData.topic_name,
-				'category_name':topicData.category_name,
-				'category_slug':topicData.category_slug,
-				'locked': parseInt(topicData.locked) || 0,
-				'deleted': parseInt(topicData.deleted) || 0,
-				'pinned': parseInt(topicData.pinned) || 0,
-				'slug': topicData.slug,
-				'topic_id': tid,
-				'expose_tools': privileges.editable ? 1 : 0,
-				'posts': retrieved_posts,
-				'main_posts': main_posts
 			});
-
 		});
 	}
 

src/websockets.js

@@ -381,6 +381,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 
 		socket.on('api:post.privileges', function(pid) {
 			postTools.privileges(pid, uid, function(privileges) {
+				privileges.pid = parseInt(pid);
 				socket.emit('api:post.privileges', privileges);
 			});
 		});
@@ -404,6 +405,19 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			}
 		});
 
+		socket.on('api:topic.loadMore', function(data) {
+			var	start = data.after,
+				end = start + 10;
+
+			posts.getPostsByTid(data.tid, uid, start, end, function(posts){
+				postTools.constructPostObject(posts, data.tid, uid, null, function(postObj) {
+					io.sockets.in('topic_' + data.tid).emit('event:new_post', {
+						posts: postObj
+					});
+				});
+			});
+		});
+
 		socket.on('api:admin.topics.getMore', function(data) {
 			topics.getAllTopics(data.limit, data.after, function(topics) {
 				socket.emit('api:admin.topics.getMore', JSON.stringify(topics));