Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/templates/category.tpl

@@ -48,7 +48,7 @@
 			<div class="block-header">
 				Recent Replies
 			</div>
-			<div class="block-content">
+			<div class="block-content" id="category_recent_replies">
 				
 			</div>
 		</div>
@@ -82,6 +82,7 @@
 
 <script type="text/javascript">
 (function() {
+	var cid = '{category_id}';
 	var	room = 'category_' + '{category_id}';
 	app.enter_room(room);
 
@@ -129,9 +130,10 @@
 
 
 
-	//socket.emit('api:topics.getRecentReplies', tid);
-	socket.on('api:topics.getRecentReplies', function(replies) {
+	socket.emit('api:categories.getRecentReplies', cid);
+	socket.on('api:categories.getRecentReplies', function(replies) {
 		console.log(replies);
+		jQuery('#category_recent_replies')	
 	});
 
 })();

src/categories.js

@@ -259,7 +259,11 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-
+	Categories.getRecentReplies = function(cid, callback) {
+		RDB.zrange('categories:recent_posts:cid:' + cid, 0, -1, function(err, replies) {
+			callback(replies);
+		});
+	}
 
 	Categories.getCategories = function(cids, callback, current_user) {
 		if (cids.length === 0) {

src/posts.js

@@ -24,7 +24,23 @@ marked.setOptions({
 			
 			topics.markAsRead(tid, current_user);
 
-			var content = [], uid = [], timestamp = [], pid = [], post_rep = [], editor = [], editTime = [], deleted = [];
+			Posts.getPostsByPids(pids, current_user, function(posts) {
+				callback(posts);
+			})
+			
+			
+
+		});
+	}
+
+	// todo, getPostsByPids has duplicated stuff, have that call this fn.
+	Posts.getPostSummaryByPids = function(pids, callback) {
+		var content = [], uid = [], timestamp = [];
+
+	};
+
+	Posts.getPostsByPids = function(pids, current_user, callback) {
+		var content = [], uid = [], timestamp = [], post_rep = [], editor = [], editTime = [], deleted = [];
 
 		for (var i=0, ii=pids.length; i<ii; i++) {
 			content.push('pid:' + pids[i] + ':content');
@@ -34,7 +50,6 @@ marked.setOptions({
 			editor.push('pid:' + pids[i] + ':editor');
 			editTime.push('pid:' + pids[i] + ':edited');
 			deleted.push('pid:' + pids[i] + ':deleted');
-				pid.push(pids[i]);
 		}
 
 
@@ -90,8 +105,6 @@ marked.setOptions({
 				'postData' : results[1].posts
 			});
 		});
-
-		});
 	}
 
 	Posts.get_tid_by_pid = function(pid, callback) {
@@ -127,8 +140,8 @@ marked.setOptions({
 			return;
 		}
 
-		user.getUserField(uid, 'lastposttime', function(lastposttime) {
 
+		user.getUserField(uid, 'lastposttime', function(lastposttime) {
 			if(new Date().getTime() - lastposttime < config.post_delay) {
 				socket.emit('event:alert', {
 					title: 'Too many posts!',

src/redis.js

@@ -37,4 +37,29 @@
 		});
 	};
 
+	/*
+	* A lot of redis calls come back like this:
+	* [key, value, key, value, key, value]
+	* this is a simple utility fn to turn this into an object.
+	*/
+	RedisDB.exports.objectify = function(arr) {
+		var obj = {};
+		for (var i = 0; i < arr.length; i += 2) {
+		    obj[arr[i]] = arr[i+1];
+		}
+		return obj;
+	};
+
+	/*
+	* Similar to .objectify, this utility function splits the data array into two arrays
+	*/
+	RedisDB.exports.splitify = function(arr) {
+		var arr1 = [], arr2 = [];
+		for (var i = 0; i < arr.length; i += 2) {
+		    arr1.push(arr[i]);
+		    arr2.push(arr[i+1]);
+		}
+		return [arr1,arr2];
+	};
+
 }(module));

src/topics.js

@@ -273,11 +273,6 @@ marked.setOptions({
 		});
 	}
 
-	Topics.getRecentReplies = function(tid, callback) {
-		RDB.zrange('topics:recent_posts:tid:' + tid, 0, -1, 'WITHSCORES', function(err, replies) {
-			callback(replies);
-		});
-	}
 
 	Topics.post = function(socket, uid, title, content, category_id) {
 		if (!category_id) throw new Error('Attempted to post without a category_id');

src/websockets.js

@@ -263,10 +263,9 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			notifications.mark_read(nid, uid);
 		});
 
-		socket.on('api:topics.getRecentReplies', function(tid) {
-			console.log('test');
-			topics.getRecentReplies(tid, function(replies) {
-				socket.emit('api:topics.getRecentReplies', replies);
+		socket.on('api:categories.getRecentReplies', function(tid) {
+			categories.getRecentReplies(tid, function(replies) {
+				socket.emit('api:categories.getRecentReplies', replies);
 			});
 		});