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

closes #6248 , closes #6282

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-26 12:25:59 -05:00
parent c37be3b58f
commit 2e2b97033e
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/topics.js
View File

@@ -198,6 +198,7 @@ Topics.getTopicWithPosts = function (topicData, set, uid, start, stop, reverse,
bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid),
postSharing: async.apply(social.getActivePostSharing),
deleter: async.apply(getDeleter, topicData),
merger: async.apply(getMerger, topicData),
related: function (next) {
async.waterfall([
function (next) {
@@ -223,6 +224,8 @@ Topics.getTopicWithPosts = function (topicData, set, uid, start, stop, reverse,
topicData.postSharing = results.postSharing;
topicData.deleter = results.deleter;
topicData.deletedTimestampISO = utils.toISOString(topicData.deletedTimestamp);
topicData.merger = results.merger;
topicData.mergedTimestampISO = utils.toISOString(topicData.mergedTimestamp);
topicData.related = results.related || [];
topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
@@ -290,6 +293,28 @@ function getDeleter(topicData, callback) {
user.getUserFields(topicData.deleterUid, ['username', 'userslug', 'picture'], callback);
}
function getMerger(topicData, callback) {
if (!topicData.mergerUid) {
return setImmediate(callback, null, null);
}
async.waterfall([
function (next) {
async.parallel({
merger: function (next) {
user.getUserFields(topicData.mergerUid, ['username', 'userslug', 'picture'], next);
},
mergedIntoTitle: function (next) {
Topics.getTopicField(topicData.mergeIntoTid, 'title', next);
},
}, next);
},
function (results, next) {
results.merger.mergedIntoTitle = results.mergedIntoTitle;
next(null, results.merger);
},
], callback);
}
Topics.getMainPost = function (tid, uid, callback) {
Topics.getMainPosts([tid], uid, function (err, mainPosts) {
callback(err, Array.isArray(mainPosts) && mainPosts.length ? mainPosts[0] : null);