Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed posts.reply to use the getUserFields method and removed the 2 old methods from user.js

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-05-06 13:01:07 -04:00
parent 47782df9cb
commit 57354fe582
2 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/posts.js
View File

@@ -162,8 +162,9 @@ var RDB = require('./redis.js'),
timeout: 2000 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', { socket.in('topic_' + tid).emit('event:new_post', {
@@ -172,10 +173,10 @@ var RDB = require('./redis.js'),
'pid' : pid, 'pid' : pid,
'content' : marked(content || ''), 'content' : marked(content || ''),
'uid' : uid, 'uid' : uid,
'username' : user_details.username[0] || 'anonymous', 'username' : data.username || 'anonymous',
'user_rep' : user_details.rep[0] || 0, 'user_rep' : data.reputation || 0,
'post_rep' : 0, 'post_rep' : 0,
'gravatar' : gravatars[0], 'gravatar' : data.picture,
'timestamp' : timestamp, 'timestamp' : timestamp,
'relativeTime': utils.relativeTime(timestamp), 'relativeTime': utils.relativeTime(timestamp),
'fav_star_class' :'icon-star-empty' 'fav_star_class' :'icon-star-empty'
@@ -183,8 +184,6 @@ var RDB = require('./redis.js'),
] ]
}); });
}); });
});
}); });
}; };

40
src/user.js
View File

@@ -52,20 +52,6 @@ var config = require('../config.js'),
RDB.db.hset(String(uid), field, value); 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) { User.loginViaLocal = function(username, password, next) {
if (!username || !password) { if (!username || !password) {
@@ -338,32 +324,6 @@ var config = require('../config.js'),
} }
}; };
User.get_user_postdetails = function(uids, callback) {
var multi_queue = RDB.db.multi();
for(var i=0, ii=uids.length; i<ii; ++i) {
multi_queue = multi_queue.hmget(uids[i], 'username', 'reputation');
}
var usernames = [];
var reputations = [];
multi_queue.exec(function (err, replies) {
replies.forEach(function (reply, index) {
usernames.push(reply[0]);
reputations.push(reply[1]);
});
callback({
'username':usernames,
'rep':reputations
});
});
}
User.get_uid_by_email = function(email, callback) { User.get_uid_by_email = function(email, callback) {
RDB.get('email:' + email + ':uid', callback) RDB.get('email:' + email + ':uid', callback)
}; };