hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into less-is-moar

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 53f1e4d3d4 e3ec4e938a
commit 7f11d78b82
8 changed files with 93 additions and 166 deletions
Show Stats Download Patch File Download Diff File

22
public/src/forum/topic.js
Unescape Escape View File

@ -983,8 +983,6 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}; };
function updateHeader() { function updateHeader() {
var paginationEl = $('#pagination');
$('.pagination-block a').off('click').on('click', function() { $('.pagination-block a').off('click').on('click', function() {
return false; return false;
}); });
@ -997,16 +995,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
app.scrollToBottom(); app.scrollToBottom();
}); });
var windowHeight = jQuery(window).height(); if($(window).scrollTop() > 50) {
var scrollTop = jQuery(window).scrollTop(); $('#header-topic-title').text(templates.get('topic_name')).show();
var scrollBottom = scrollTop + windowHeight;
var progressBar = $('.progress-bar');
var tid = templates.get('topic_id');
if(scrollTop > 50) {
$('#header-topic-title').html(templates.get('topic_name')).show();
} else { } else {
$('#header-topic-title').html('').hide(); $('#header-topic-title').text('').hide();
} }
$($('.posts > .post-row').get().reverse()).each(function() { $($('.posts > .post-row').get().reverse()).each(function() {
@ -1017,8 +1009,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if(index > Topic.postCount) { if(index > Topic.postCount) {
index = Topic.postCount; index = Topic.postCount;
} }
paginationEl.html(index + ' out of ' + Topic.postCount); $('#pagination').html(index + ' out of ' + Topic.postCount);
progressBar.width((index / Topic.postCount * 100) + '%'); $('.progress-bar').width((index / Topic.postCount * 100) + '%');
return false; return false;
} }
}); });
@ -1028,9 +1020,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if (elementInView(el)) { if (elementInView(el)) {
var index = parseInt(el.attr('data-index'), 10) + 1; var index = parseInt(el.attr('data-index'), 10) + 1;
if(index === 0) { if(index === 0) {
localStorage.removeItem("topic:" + tid + ":bookmark"); localStorage.removeItem("topic:" + templates.get('topic_id') + ":bookmark");
} else { } else {
localStorage.setItem("topic:" + tid + ":bookmark", el.attr('data-pid')); localStorage.setItem("topic:" + templates.get('topic_id') + ":bookmark", el.attr('data-pid'));
} }
return false; return false;
} }

12
public/templates/category.tpl
Unescape Escape View File

@ -33,7 +33,7 @@
<ul id="topics-container" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}"> <ul id="topics-container" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
<meta itemprop="itemListOrder" content="descending"> <meta itemprop="itemListOrder" content="descending">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class} {topics.unread-class}" itemprop="itemListElement"> <li class="category-item <!-- IF topics.deleted -->deleted<!-- ENDIF topics.deleted --><!-- IF topics.unread -->unread<!-- ENDIF topics.unread -->" itemprop="itemListElement">
<div class="col-md-12 col-xs-12 panel panel-default topic-row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
@ -50,7 +50,7 @@
<a href="../../topic/{topics.slug}" itemprop="url"> <a href="../../topic/{topics.slug}" itemprop="url">
<meta itemprop="name" content="{topics.title}"> <meta itemprop="name" content="{topics.title}">
<strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> <strong><!-- IF topics.pinned --><i class="fa fa-thumb-tack"></i><!-- ENDIF topics.pinned --> <!-- IF topics.locked --><i class="fa fa-lock"></i><!-- ENDIF topics.locked --></strong>
<span class="topic-title">{topics.title}</span> <span class="topic-title">{topics.title}</span>
</a> </a>
</h3> </h3>
@ -74,13 +74,13 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
[[category:no_replies]] [[category:no_replies]]
<!-- ELSE --> <!-- ELSE -->
<a href="../../user/{topics.teaser_userslug}"> <a href="../../user/{topics.teaser.userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="../../topic/{topics.slug}#{topics.teaser.pid}">
[[category:replied]] [[category:replied]]
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser.timestamp}"></span>
<!-- ENDIF topics.unreplied --> <!-- ENDIF topics.unreplied -->
</span> </span>
</small> </small>

16
public/templates/popular.tpl
Unescape Escape View File

@ -24,7 +24,7 @@
<div class="col-md-12"> <div class="col-md-12">
<ul id="topics-container" data-nextstart="{nextStart}"> <ul id="topics-container" data-nextstart="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class} {topics.unread-class}"> <li class="category-item <!-- IF topics.deleted --> deleted<!-- ENDIF topics.deleted --><!-- IF topics.unread --> unread<!-- ENDIF topics.unread -->">
<div class="col-md-12 col-xs-12 panel panel-default topic-row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
<a href="{relative_path}/user/{topics.userslug}" class="pull-left"> <a href="{relative_path}/user/{topics.userslug}" class="pull-left">
<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" /> <img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
@ -32,7 +32,7 @@
<h3> <h3>
<a href="{relative_path}/topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong> <strong><!-- IF topics.pinned --><i class="fa fa-thumb-tack"></i><!-- ENDIF topics.pinned --> <!-- IF topics.locked --><i class="fa fa-lock"></i><!-- ENDIF topics.locked --></strong>
<span class="topic-title">{topics.title}</span> <span class="topic-title">{topics.title}</span>
</a> </a>
</h3> </h3>
@ -50,8 +50,8 @@
| |
<span> <span>
[[category:posted]] [[global:in]] [[category:posted]] [[global:in]]
<a href="{relative_path}/category/{topics.categorySlug}"> <a href="{relative_path}/category/{topics.category.slug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName} <i class="fa {topics.category.icon}"></i> {topics.category.name}
</a> </a>
<span class="timeago" title="{topics.relativeTime}"></span> <span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
@ -61,13 +61,13 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
[[category:no_replies]] [[category:no_replies]]
<!-- ELSE --> <!-- ELSE -->
<a href="{relative_path}/user/{topics.teaser_userslug}"> <a href="{relative_path}/user/{topics.teaser.userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
</a> </a>
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}"> <a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
[[category:replied]] [[category:replied]]
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser.timestamp}"></span>
<!-- ENDIF topics.unreplied --> <!-- ENDIF topics.unreplied -->
</span> </span>
</small> </small>

16
public/templates/recent.tpl
Unescape Escape View File

@ -25,7 +25,7 @@
<div class="col-md-12"> <div class="col-md-12">
<ul id="topics-container" data-nextstart="{nextStart}"> <ul id="topics-container" data-nextstart="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class} {topics.unread-class}"> <li class="category-item <!-- IF topics.deleted --> deleted<!-- ENDIF topics.deleted --><!-- IF topics.unread --> unread<!-- ENDIF topics.unread -->">
<div class="col-md-12 col-xs-12 panel panel-default topic-row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
<a href="{relative_path}/user/{topics.userslug}" class="pull-left"> <a href="{relative_path}/user/{topics.userslug}" class="pull-left">
<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" /> <img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
@ -33,7 +33,7 @@
<h3> <h3>
<a href="{relative_path}/topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong> <strong><!-- IF topics.pinned --><i class="fa fa-thumb-tack"></i><!-- ENDIF topics.pinned --> <!-- IF topics.locked --><i class="fa fa-lock"></i><!-- ENDIF topics.locked --></strong>
<span class="topic-title">{topics.title}</span> <span class="topic-title">{topics.title}</span>
</a> </a>
</h3> </h3>
@ -51,9 +51,7 @@
| |
<span> <span>
[[category:posted]] [[global:in]] [[category:posted]] [[global:in]]
<a href="{relative_path}/category/{topics.categorySlug}"> <a href="{relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span> <span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</span> </span>
@ -62,13 +60,13 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
[[category:no_replies]] [[category:no_replies]]
<!-- ELSE --> <!-- ELSE -->
<a href="{relative_path}/user/{topics.teaser_userslug}"> <a href="{relative_path}/user/{topics.teaser.userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
</a> </a>
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}"> <a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
[[category:replied]] [[category:replied]]
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser.timestamp}"></span>
<!-- ENDIF topics.unreplied --> <!-- ENDIF topics.unreplied -->
</span> </span>
</small> </small>

16
public/templates/unread.tpl
Unescape Escape View File

@ -19,14 +19,14 @@
<div class="col-md-12"> <div class="col-md-12">
<ul id="topics-container" data-nextstart="{nextStart}"> <ul id="topics-container" data-nextstart="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class}"> <li class="category-item <!-- IF topics.deleted --> deleted<!-- ENDIF topics.deleted -->">
<div class="col-md-12 col-xs-12 panel panel-default topic-row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
<a href="{relative_path}/user/{topics.userslug}" class="pull-left"> <a href="{relative_path}/user/{topics.userslug}" class="pull-left">
<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" /> <img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
</a> </a>
<h3> <h3>
<a href="{relative_path}/topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong> <strong><!-- IF topics.pinned --><i class="fa fa-thumb-tack"></i><!-- ENDIF topics.pinned --> <!-- IF topics.locked --><i class="fa fa-lock"></i><!-- ENDIF topics.locked --></strong>
<span class="topic-title">{topics.title}</span> <span class="topic-title">{topics.title}</span>
</a> </a>
</h3> </h3>
@ -44,9 +44,7 @@
| |
<span> <span>
[[category:posted]] [[global:in]] [[category:posted]] [[global:in]]
<a href="{relative_path}/category/{topics.categorySlug}"> <a href="{relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span> <span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</span> </span>
@ -55,13 +53,13 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
[[category:no_replies]] [[category:no_replies]]
<!-- ELSE --> <!-- ELSE -->
<a href="{relative_path}/user/{topics.teaser_userslug}"> <a href="{relative_path}/user/{topics.teaser.userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser.picture}" title="{topics.teaser.username}"/>
</a> </a>
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}"> <a href="{relative_path}/topic/{topics.slug}#{topics.teaser.pid}">
[[category:replied]] [[category:replied]]
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser.timestamp}"></span>
<!-- ENDIF topics.unreplied --> <!-- ENDIF topics.unreplied -->
</span> </span>
</small> </small>

8
src/postTools.js
Unescape Escape View File

@ -153,7 +153,11 @@ var winston = require('winston'),
// Delete the thread if it is the last undeleted post // Delete the thread if it is the last undeleted post
threadTools.getLatestUndeletedPid(postData.tid, function(err, pid) { threadTools.getLatestUndeletedPid(postData.tid, function(err, pid) {
if (err && err.message === 'no-undeleted-pids-found') { if(err) {
return winston.error(err.message);
}
if (!pid) {
threadTools.delete(postData.tid, uid, function(err) { threadTools.delete(postData.tid, uid, function(err) {
if (err) { if (err) {
winston.error('Could not delete topic (tid: ' + postData.tid + ')', err.stack); winston.error('Could not delete topic (tid: ' + postData.tid + ')', err.stack);
@ -166,7 +170,6 @@ var winston = require('winston'),
} }
}); });
callback(null); callback(null);
}); });
}; };
@ -182,7 +185,6 @@ var winston = require('winston'),
} }
}); });
}); });
} }
PostTools.restore = function(uid, pid, callback) { PostTools.restore = function(uid, pid, callback) {

5
src/threadTools.js
Unescape Escape View File

@ -310,8 +310,9 @@ var winston = require('winston'),
if(err) { if(err) {
return callback(err); return callback(err);
} }
if (pids.length === 0) { if (pids.length === 0) {
return callback(new Error('no-undeleted-pids-found')); return callback(null, null);
} }
async.detectSeries(pids, function(pid, next) { async.detectSeries(pids, function(pid, next) {
@ -322,7 +323,7 @@ var winston = require('winston'),
if (pid) { if (pid) {
callback(null, pid); callback(null, pid);
} else { } else {
callback(new Error('no-undeleted-pids-found')); callback(null, null);
} }
}); });
}); });

164
src/topics.js
Unescape Escape View File

@ -134,12 +134,16 @@ var async = require('async'),
next(null, postData); next(null, postData);
}, },
function(postData, next) { function(postData, next) {
Topics.getTopicForCategoryView(postData.tid, uid, function(err, topicData) { Topics.getTopicsByTids([postData.tid], data.cid, uid, function(err, topicData) {
if(err) { if(err) {
return next(err); return next(err);
} }
if(!topicData || !topicData.length) {
return next(new Error('no-topic'));
}
topicData = topicData[0];
topicData.unreplied = 1; topicData.unreplied = 1;
next(null, { next(null, {
topicData: topicData, topicData: topicData,
postData: postData postData: postData
@ -325,18 +329,22 @@ var async = require('async'),
Topics.getTopicDataWithUser = function(tid, callback) { Topics.getTopicDataWithUser = function(tid, callback) {
Topics.getTopicData(tid, function(err, topic) { Topics.getTopicData(tid, function(err, topic) {
if(err || !topic) { if (err || !topic) {
return callback(err || new Error('topic doesn\'t exist')); return callback(err || new Error('topic doesn\'t exist'));
} }
user.getUserFields(topic.uid, ['username', 'userslug', 'picture'] , function(err, userData) { user.getUserFields(topic.uid, ['username', 'userslug', 'picture'] , function(err, userData) {
if(err) { if (err) {
return callback(err); return callback(err);
} }
topic.username = userData.username; if (!userData) {
topic.userslug = userData.userslug userData = {};
topic.picture = userData.picture; }
topic.username = userData.username || 'Anonymous';
topic.userslug = userData.userslug || '';
topic.picture = userData.picture || gravatar.url('', {}, true);
callback(null, topic); callback(null, topic);
}); });
}); });
@ -669,47 +677,20 @@ var async = require('async'),
} }
function getTopicInfo(topicData, callback) { function getTopicInfo(topicData, callback) {
async.parallel({
function getUserInfo(next) { hasread : function (next) {
user.getUserFields(topicData.uid, ['username', 'userslug', 'picture'], next); Topics.hasReadTopic(topicData.tid, current_user, next);
} },
teaser : function (next) {
function hasReadTopic(next) { Topics.getTeaser(topicData.tid, next);
Topics.hasReadTopic(topicData.tid, current_user, next); },
} privileges : function (next) {
categoryTools.privileges(topicData.cid, current_user, next);
function getTeaserInfo(next) { },
Topics.getTeaser(topicData.tid, function(err, teaser) { categoryData : function (next) {
next(null, teaser || {}); categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], next);
});
}
// temporary. I don't think this call should belong here
function getPrivileges(next) {
categoryTools.privileges(cid, current_user, next);
}
function getCategoryInfo(next) {
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], next);
}
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) {
if(err) {
return callback(err);
} }
}, callback);
callback(null, {
username: results[0].username,
userslug: results[0].userslug,
picture: results[0].picture,
userbanned: results[0].banned,
hasread: results[1],
teaserInfo: results[2],
privileges: results[3],
categoryData: results[4]
});
});
} }
function isTopicVisible(topicData, topicInfo) { function isTopicVisible(topicData, topicInfo) {
@ -719,7 +700,8 @@ var async = require('async'),
} }
function loadTopic(tid, next) { function loadTopic(tid, next) {
Topics.getTopicData(tid, function(err, topicData) {
Topics.getTopicDataWithUser(tid, function(err, topicData) {
if(err) { if(err) {
return next(err); return next(err);
} }
@ -737,25 +719,14 @@ var async = require('async'),
return next(); return next();
} }
topicData['pin-icon'] = parseInt(topicData.pinned, 10) === 1 ? 'fa-thumb-tack' : 'none'; topicData.pinned = parseInt(topicData.pinned, 10) === 1;
topicData['lock-icon'] = parseInt(topicData.locked, 10) === 1 ? 'fa-lock' : 'none'; topicData.locked = parseInt(topicData.locked, 10) === 1;
topicData['deleted-class'] = parseInt(topicData.deleted, 10) === 1 ? 'deleted' : ''; topicData.deleted = parseInt(topicData.deleted, 10) === 1;
topicData['unread-class'] = !(topicInfo.hasread && parseInt(current_user, 10) !== 0) ? 'unread' : '';
topicData.unread = !(topicInfo.hasread && parseInt(current_user, 10) !== 0); topicData.unread = !(topicInfo.hasread && parseInt(current_user, 10) !== 0);
topicData.unreplied = parseInt(topicData.postcount, 10) === 1; topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
topicData.username = topicInfo.username || 'anonymous';
topicData.userslug = topicInfo.userslug || ''; topicData.category = topicInfo.categoryData;
topicData.picture = topicInfo.picture || gravatar.url('', {}, true); topicData.teaser = topicInfo.teaser;
topicData.categoryIcon = topicInfo.categoryData.icon;
topicData.categoryName = topicInfo.categoryData.name;
topicData.categorySlug = topicInfo.categoryData.slug;
topicData.teaser_username = topicInfo.teaserInfo.username || '';
topicData.teaser_userslug = topicInfo.teaserInfo.userslug || '';
topicData.teaser_userpicture = topicInfo.teaserInfo.picture || gravatar.url('', {}, true);
topicData.teaser_pid = topicInfo.teaserInfo.pid;
topicData.teaser_timestamp = utils.toISOString(topicInfo.teaserInfo.timestamp);
next(null, topicData); next(null, topicData);
}); });
@ -851,45 +822,6 @@ var async = require('async'),
}); });
}; };
Topics.getTopicForCategoryView = function(tid, uid, callback) {
function getTopicData(next) {
Topics.getTopicDataWithUser(tid, next);
}
function getReadStatus(next) {
Topics.hasReadTopic(tid, uid, next);
}
function getTeaser(next) {
Topics.getTeaser(tid, next);
}
async.parallel([getTopicData, getReadStatus, getTeaser], function(err, results) {
if (err) {
return callback(err);
}
var topicData = results[0],
hasRead = results[1],
teaser = results[2];
topicData['pin-icon'] = parseInt(topicData.pinned, 10) === 1 ? 'fa-thumb-tack' : 'none';
topicData['lock-icon'] = parseInt(topicData.locked, 10) === 1 ? 'fa-lock' : 'none';
topicData['unread-class'] = !(hasRead && parseInt(uid, 10) !== 0) ? 'unread' : '';
topicData.unread = !(hasRead && parseInt(uid, 10) !== 0);
topicData.teaser_username = teaser.username || '';
topicData.teaser_userslug = teaser.userslug || '';
topicData.userslug = teaser.userslug || '';
topicData.teaser_timestamp = utils.toISOString(teaser.timestamp);
topicData.teaser_userpicture = teaser.picture;
callback(null, topicData);
});
};
Topics.getAllTopics = function(start, end, callback) { Topics.getAllTopics = function(start, end, callback) {
db.getSortedSetRevRange('topics:tid', start, end, function(err, tids) { db.getSortedSetRevRange('topics:tid', start, end, function(err, tids) {
if(err) { if(err) {
@ -1026,9 +958,7 @@ var async = require('async'),
return callback(null, []); return callback(null, []);
} }
async.map(tids, function(tid, next) { async.map(tids, Topics.getTeaser, callback)
Topics.getTeaser(tid, next);
}, callback);
}; };
Topics.getTeaser = function(tid, callback) { Topics.getTeaser = function(tid, callback) {
@ -1037,6 +967,10 @@ var async = require('async'),
return callback(err); return callback(err);
} }
if (!pid) {
return callback(null, null);
}
posts.getPostFields(pid, ['pid', 'uid', 'timestamp'], function(err, postData) { posts.getPostFields(pid, ['pid', 'uid', 'timestamp'], function(err, postData) {
if (err) { if (err) {
return callback(err); return callback(err);
@ -1052,9 +986,9 @@ var async = require('async'),
callback(null, { callback(null, {
pid: postData.pid, pid: postData.pid,
username: userData.username || 'anonymous', username: userData.username || 'anonymous',
userslug: userData.userslug, userslug: userData.userslug || '',
picture: userData.picture || gravatar.url('', {}, true), picture: userData.picture || gravatar.url('', {}, true),
timestamp: postData.timestamp timestamp: utils.toISOString(postData.timestamp)
}); });
}); });
}); });
@ -1103,7 +1037,7 @@ var async = require('async'),
Topics.isLocked = function(tid, callback) { Topics.isLocked = function(tid, callback) {
Topics.getTopicField(tid, 'locked', function(err, locked) { Topics.getTopicField(tid, 'locked', function(err, locked) {
if(err) { if(err) {
return callback(err, null); return callback(err);
} }
callback(null, parseInt(locked, 10) === 1); callback(null, parseInt(locked, 10) === 1);
}); });
@ -1138,16 +1072,18 @@ var async = require('async'),
function getUid(pid, next) { function getUid(pid, next) {
posts.getPostField(pid, 'uid', function(err, uid) { posts.getPostField(pid, 'uid', function(err, uid) {
if (err) if (err) {
return next(err); return next(err);
}
uids[uid] = 1; uids[uid] = 1;
next(null); next();
}); });
} }
async.each(pids, getUid, function(err) { async.each(pids, getUid, function(err) {
if (err) if (err) {
return callback(err, null); return callback(err);
}
callback(null, Object.keys(uids)); callback(null, Object.keys(uids));
}); });

Write Preview
Loading…
Cancel
Save