Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
psychobunny
2013-05-06 17:09:15 +00:00
parent ecf3ffa170 57354fe582
commit 92175274b5
2 changed files with 19 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/posts.js
View File

@@ -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) {
var timestamp = new Date().getTime();
user.getUserFields(uid, ['username','reputation','picture'], function(data){
var timestamp = new Date().getTime();
socket.in('topic_' + tid).emit('event:new_post', {
'posts' : [
{
'pid' : pid,
'content' : marked(content || ''),
'uid' : uid,
'username' : user_details.username[0] || 'anonymous',
'user_rep' : user_details.rep[0] || 0,
'post_rep' : 0,
'gravatar' : gravatars[0],
'timestamp' : timestamp,
'relativeTime': utils.relativeTime(timestamp),
'fav_star_class' :'icon-star-empty'
}
]
});
socket.in('topic_' + tid).emit('event:new_post', {
'posts' : [
{
'pid' : pid,
'content' : marked(content || ''),
'uid' : uid,
'username' : data.username || 'anonymous',
'user_rep' : data.reputation || 0,
'post_rep' : 0,
'gravatar' : data.picture,
'timestamp' : timestamp,
'relativeTime': utils.relativeTime(timestamp),
'fav_star_class' :'icon-star-empty'
}
]
});
});
});
};

37
src/user.js
View File

@@ -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)
};