Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-02 20:59:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/posts.js
	src/topics.js
This commit is contained in:
psychobunny
2013-05-07 18:29:20 +00:00
parent ae2be687b8 ae43a299df
commit 2dccfb96e7
9 changed files with 246 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/posts.js
View File

@@ -1,7 +1,8 @@
var RDB = require('./redis.js'),
utils = require('./utils.js'),
marked = require('marked'),
user = require('./user.js');
user = require('./user.js'),
config = require('../config.js');
(function(Posts) {
@@ -9,12 +10,12 @@ var RDB = require('./redis.js'),
if (start == null) start = 0;
if (end == null) end = start + 10;
var post_data, user_data, thread_data, vote_data;
var post_data, user_data, thread_data, vote_data, viewer_data;
//compile thread after all data is asynchronously called
function generateThread() {
if (!post_data ||! user_data || !thread_data || !vote_data) return;
if (!post_data ||! user_data || !thread_data || !vote_data || !viewer_data) return;
var posts = [];
@@ -42,7 +43,9 @@ var RDB = require('./redis.js'),
'category_name':thread_data.category_name,
'category_slug':thread_data.category_slug,
'locked': parseInt(thread_data.locked) || 0,
'deleted': parseInt(thread_data.deleted) || 0,
'topic_id': tid,
'expose_tools': viewer_data.reputation >= config.privilege_thresholds.manage_thread ? 1 : 0,
'posts': posts
});
}
@@ -76,6 +79,7 @@ var RDB = require('./redis.js'),
.get('tid:' + tid + ':locked')
.get('tid:' + tid + ':category_name')
.get('tid:' + tid + ':category_slug')
.get('tid:' + tid + ':deleted')
.exec(function(err, replies) {
post_data = {
pid: pids,
@@ -89,7 +93,8 @@ var RDB = require('./redis.js'),
topic_name: replies[4],
locked: replies[5],
category_name: replies[6],
category_slug: replies[7]
category_slug: replies[7],
deleted: replies[8] || 0
};
user.getMultipleUserFields(post_data.uid, ['username','reputation','picture'], function(user_details){
@@ -97,7 +102,13 @@ var RDB = require('./redis.js'),
generateThread();
});
});
});
user.getUserField(current_user, 'reputation', function(reputation){
viewer_data = {
reputation: reputation
};
generateThread();
});
}