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

fixing up posts behaviour when a mod is the viewer

Browse Source
This commit is contained in:
Julian Lam
2013-05-16 16:23:17 -04:00
parent 6dd960d6c3
commit 2258ab3503
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/posts.js
View File

@@ -21,12 +21,13 @@ marked.setOptions({
getTopicPosts(); getTopicPosts();
getUserReputation(); getViewerData();
//compile thread after all data is asynchronously called //compile thread after all data is asynchronously called
function generateThread() { function generateThread() {
if (!post_data || !user_data || !thread_data || !vote_data || !viewer_data) return; if (!post_data || !user_data || !thread_data || !vote_data || !viewer_data) return;
console.log(viewer_data);
var posts = [], var posts = [],
main_posts = [], main_posts = [],
@@ -49,7 +50,7 @@ marked.setOptions({
'user_rep' : user_data[uid].reputation || 0, 'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e', 'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty', 'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools': (uid == current_user || manage_content) ? 'show' : 'none', 'display_moderator_tools': (uid == current_user || manage_content || viewer_data.isModerator) ? 'show' : 'none',
'edited-class': post_data.editor[i] !== null ? '' : 'none', 'edited-class': post_data.editor[i] !== null ? '' : 'none',
'editor': post_data.editor[i] !== null ? user_data[post_data.editor[i]].username : '', 'editor': post_data.editor[i] !== null ? user_data[post_data.editor[i]].username : '',
'relativeEditTime': post_data.editTime !== null ? utils.relativeTime(post_data.editTime[i]) : '', 'relativeEditTime': post_data.editTime !== null ? utils.relativeTime(post_data.editTime[i]) : '',
@@ -69,7 +70,7 @@ marked.setOptions({
'deleted': parseInt(thread_data.deleted) || 0, 'deleted': parseInt(thread_data.deleted) || 0,
'pinned': parseInt(thread_data.pinned) || 0, 'pinned': parseInt(thread_data.pinned) || 0,
'topic_id': tid, 'topic_id': tid,
'expose_tools': viewer_data.reputation >= config.privilege_thresholds.manage_thread ? 1 : 0, 'expose_tools': (manage_content || viewer_data.isModerator) ? 1 : 0,
'posts': posts, 'posts': posts,
'main_posts': main_posts 'main_posts': main_posts
}); });
@@ -155,12 +156,27 @@ marked.setOptions({
}); });
} }
function getUserReputation() { function getViewerData() {
user.getUserField(current_user, 'reputation', function(reputation){ async.parallel([
viewer_data = { function(callback) {
reputation: reputation user.getUserField(current_user, 'reputation', function(reputation){
}; viewer_data = viewer_data || {};
generateThread(); viewer_data.reputation = reputation;
callback(null);
});
},
function(callback) {
RDB.get('tid:' + tid + ':cid', function(err, cid) {
user.isModerator(current_user, cid, function(isMod) {
viewer_data = viewer_data || {};
viewer_data.isModerator = isMod;
callback(null);
});
})
}
], function(err, results) {
generateThread();
}); });
} }
} }