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

src/posts.js

@@ -162,29 +162,28 @@ var	RDB = require('./redis.js'),
 				timeout: 2000
 			});
 
-			user.get_user_postdetails(uid, function(user_details) {
+		
-				user.get_gravatars_by_uids(uid, '', function(gravatars) {
+			user.getUserFields(uid, ['username','reputation','picture'], function(data){
-					var timestamp = new Date().getTime();
+				
-
+				var timestamp = new Date().getTime();
-					socket.in('topic_' + tid).emit('event:new_post', {
+
-						'posts' : [
+				socket.in('topic_' + tid).emit('event:new_post', {
-							{
+					'posts' : [
-								'pid' : pid,
+						{
-								'content' : marked(content || ''),
+							'pid' : pid,
-								'uid' : uid,
+							'content' : marked(content || ''),
-								'username' : user_details.username[0] || 'anonymous',
+							'uid' : uid,
-								'user_rep' : user_details.rep[0] || 0,
+							'username' : data.username || 'anonymous',
-								'post_rep' : 0,
+							'user_rep' : data.reputation || 0,
-								'gravatar' : gravatars[0],
+							'post_rep' : 0,
-								'timestamp' : timestamp,
+							'gravatar' : data.picture,
-								'relativeTime': utils.relativeTime(timestamp),
+							'timestamp' : timestamp,
-								'fav_star_class' :'icon-star-empty' 
+							'relativeTime': utils.relativeTime(timestamp),
-							}
+							'fav_star_class' :'icon-star-empty' 
-						]
+						}
-					});
+					]
 				});
 			});
-
 			
 		});
 	};

src/user.js

@@ -52,20 +52,6 @@ var	config = require('../config.js'),
 		RDB.db.hset(String(uid),	field, value);				
 	}
 
-	User.get_gravatars_by_uids = function(uids, size, callback) {
-		
-		var gravatars = [];
-
-		for(var i=0, ii=uids.length; i<ii; ++i) {
-						
-			User.getUserField(uids[i], 'picture', function(picture) {
-				gravatars.push(picture);
-				if(gravatars.length >= uids.length)
-					callback(gravatars);
-			});
-		}
-	};
-
 	User.loginViaLocal = function(username, password, next) {
 
 		if (!username || !password) {
@@ -338,29 +324,6 @@ var	config = require('../config.js'),
 		}
 	};
 
-	User.get_user_postdetails = function(uids, callback) {
-		
-		var usernames = [];
-		var reputations = [];
-		
-		for(var i=0, ii=uids.length; i<ii; ++i) {
-		
-			User.getUserFields(uids[i], ['username','reputation'], function(data){
-				
-				usernames.push(data['username']);
-				reputations.push(data['reputation']);
-				
-				if(usernames.length >= uids.length) {
-					
-					callback({
-						'username':usernames,
-						'rep':reputations
-					});
-				}
-			});
-		}
-	}
-
 	User.get_uid_by_email = function(email, callback) {
 		RDB.get('email:' + email + ':uid', callback)
 	};