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

test

Browse Source
This commit is contained in:
barisusakli
2015-03-11 22:47:15 -04:00
parent f89741636c
commit c63d5f4b7a
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/groups.js
View File

@@ -953,11 +953,7 @@ var async = require('async'),
var memberOf = [];
isMembers.forEach(function(isMember, index) {
if (isMember) {
if (uids.length > 1) {
memberOf.push(util._extend({}, groupData[index]));
} else {
memberOf.push(groupData[index]);
}
memberOf.push(groupData[index]);
}
});

14
src/posts/user.js
View File

@@ -33,10 +33,18 @@ module.exports = function(Posts) {
var userData = results.userData;
userData.forEach(function(userData, i) {
userData.groups = results.groups[i];
userData.groups = [];
userData.groups.forEach(function(group) {
group.selected = group.name === results.userSettings[i].groupTitle;
results.groups[i].forEach(function(group, index) {
userData.groups[index] = {
name: group.name,
slug: group.slug,
labelColor: group.labelColor,
icon: group.icon,
userTitle: group.userTitle,
userTitleEnabled: group.userTitleEnabled,
selected: group.name === results.userSettings[i].groupTitle
};
});
userData.status = user.getStatus(userData.status, results.online[i]);
});

42
src/topics.js
View File

@@ -216,11 +216,14 @@ var async = require('async'),
}
async.parallel({
mainPost: function(next) {
getMainPosts([topicData.mainPid], uid, next);
},
// mainPost: function(next) {
// getMainPosts([topicData.mainPid], uid, next);
// },
// posts: function(next) {
// Topics.getTopicPosts(tid, set, start, end, uid, reverse, next);
// },
posts: function(next) {
Topics.getTopicPosts(tid, set, start, end, uid, reverse, next);
getMainPostAndReplies(topicData, set, uid, start, end, reverse, next);
},
category: async.apply(Topics.getCategoryData, tid),
threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
@@ -231,7 +234,8 @@ var async = require('async'),
return callback(err);
}
topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts;
//topicData.posts = Array.isArray(results.mainPost) && results.mainPost.length ? [results.mainPost[0]].concat(results.posts) : results.posts;
topicData.posts = results.posts;
topicData.category = results.category;
topicData.thread_tools = results.threadTools.tools;
topicData.tags = results.tags;
@@ -249,6 +253,34 @@ var async = require('async'),
});
};
function getMainPostAndReplies(topic, set, uid, start, end, reverse, callback) {
async.waterfall([
function(next) {
posts.getPidsFromSet(set, start, end, reverse, next);
},
function(pids, next) {
if ((!Array.isArray(pids) || !pids.length) && !topic.mainPid) {
return callback(null, []);
}
if (topic.mainPid) {
pids.unshift(topic.mainPid);
}
posts.getPostsByPids(pids, uid, next);
},
function(posts, next) {
var indices = Topics.calculatePostIndices(start, end, topic.postcount, reverse);
posts.forEach(function(post, index) {
if (post) {
post.index = indices[index] - 1;
}
});
Topics.addPostData(posts, uid, callback);
}
]);
}
Topics.getMainPost = function(tid, uid, callback) {
Topics.getMainPosts([tid], uid, function(err, mainPosts) {
callback(err, Array.isArray(mainPosts) && mainPosts.length ? mainPosts[0] : null);