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

closes #6287

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-29 11:56:06 -05:00
parent d255d0c330
commit 8427601b04
7 changed files with 99 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/user/digest.js
View File

@@ -106,14 +106,14 @@ Digest.send = function (data, callback) {
function (next) {
async.parallel({
notifications: async.apply(user.notifications.getDailyUnread, userObj.uid),
topics: async.apply(topics.getPopular, data.interval, userObj.uid, 10),
popular: async.apply(topics.getPopularTopics, data.interval, userObj.uid, 0, 9),
}, next);
},
function (data, next) {
var notifications = data.notifications.filter(Boolean);
// If there are no notifications and no new topics, don't bother sending a digest
if (!notifications.length && !data.topics.length) {
if (!notifications.length && !data.popular.topics.length) {
return next();
}
@@ -124,7 +124,7 @@ Digest.send = function (data, callback) {
});
// Fix relative paths in topic data
data.topics = data.topics.map(function (topicObj) {
data.popular.topics = data.popular.topics.map(function (topicObj) {
var user = topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined ? topicObj.teaser.user : topicObj.user;
if (user && user.picture && utils.isRelativeUrl(user.picture)) {
user.picture = nconf.get('base_url') + user.picture;
@@ -138,7 +138,7 @@ Digest.send = function (data, callback) {
username: userObj.username,
userslug: userObj.userslug,
notifications: notifications,
recent: data.topics,
recent: data.popular.topics,
interval: data.interval,
showUnsubscribe: true,
}, function (err) {