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

feat: small fixes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-12-17 18:56:09 -05:00
parent b2a74b4172
commit fef7e13c9e
8 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/topics/index.js
View File

@@ -188,13 +188,15 @@ Topics.getTopicWithPosts = function (topicData, set, uid, start, stop, reverse,
topicData.bookmark = results.bookmark;
topicData.postSharing = results.postSharing;
topicData.deleter = results.deleter;
topicData.deletedTimestampISO = utils.toISOString(topicData.deletedTimestamp);
if (results.deleter) {
topicData.deletedTimestampISO = utils.toISOString(topicData.deletedTimestamp);
}
topicData.merger = results.merger;
topicData.mergedTimestampISO = utils.toISOString(topicData.mergedTimestamp);
if (results.merger) {
topicData.mergedTimestampISO = utils.toISOString(topicData.mergedTimestamp);
}
topicData.related = results.related || [];
topicData.unreplied = topicData.postcount === 1;
topicData.icons = [];
plugins.fireHook('filter:topic.get', { topic: topicData, uid: uid }, next);
@@ -245,14 +247,14 @@ function getMainPostAndReplies(topic, set, uid, start, stop, reverse, callback)
}
function getDeleter(topicData, callback) {
if (!topicData.deleterUid) {
if (!parseInt(topicData.deleterUid, 10)) {
return setImmediate(callback, null, null);
}
user.getUserFields(topicData.deleterUid, ['username', 'userslug', 'picture'], callback);
}
function getMerger(topicData, callback) {
if (!topicData.mergerUid) {
if (!parseInt(topicData.mergerUid, 10)) {
return setImmediate(callback, null, null);
}
async.waterfall([