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

fix: digest not sending topics

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-08-06 17:23:50 -04:00
parent 61f9be99e9
commit bc6f22ebdb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/user/digest.js
View File

@@ -1,18 +1,18 @@
'use strict'; 'use strict';
var async = require('async'); const async = require('async');
var winston = require('winston'); const winston = require('winston');
var nconf = require('nconf'); const nconf = require('nconf');
var batch = require('../batch'); const batch = require('../batch');
var meta = require('../meta'); const meta = require('../meta');
var user = require('../user'); const user = require('../user');
var topics = require('../topics'); const topics = require('../topics');
var plugins = require('../plugins'); const plugins = require('../plugins');
var emailer = require('../emailer'); const emailer = require('../emailer');
var utils = require('../utils'); const utils = require('../utils');
var Digest = module.exports; const Digest = module.exports;
Digest.execute = async function (payload) { Digest.execute = async function (payload) {
const digestsDisabled = meta.config.disableEmailSubscriptions === 1; const digestsDisabled = meta.config.disableEmailSubscriptions === 1;
@@ -71,13 +71,13 @@ Digest.send = async function (data) {
const users = await user.getUsersFields(data.subscribers, ['uid', 'username', 'userslug', 'lastonline']); const users = await user.getUsersFields(data.subscribers, ['uid', 'username', 'userslug', 'lastonline']);
async.eachLimit(users, 100, async function (userObj) { async.eachLimit(users, 100, async function (userObj) {
let [notifications, topics] = await Promise.all([ let [notifications, topicsData] = await Promise.all([
user.notifications.getUnreadInterval(userObj.uid, data.interval), user.notifications.getUnreadInterval(userObj.uid, data.interval),
getTermTopics(data.interval, userObj.uid, 0, 9), getTermTopics(data.interval, userObj.uid, 0, 9),
]); ]);
notifications = notifications.filter(Boolean); notifications = notifications.filter(Boolean);
// If there are no notifications and no new topics, don't bother sending a digest // If there are no notifications and no new topics, don't bother sending a digest
if (!notifications.length && !topics.length) { if (!notifications.length && !topicsData.length) {
return; return;
} }
@@ -88,7 +88,7 @@ Digest.send = async function (data) {
}); });
// Fix relative paths in topic data // Fix relative paths in topic data
topics = topics.map(function (topicObj) { topicsData = topicsData.map(function (topicObj) {
const user = topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined ? topicObj.teaser.user : topicObj.user; const user = topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined ? topicObj.teaser.user : topicObj.user;
if (user && user.picture && utils.isRelativeUrl(user.picture)) { if (user && user.picture && utils.isRelativeUrl(user.picture)) {
user.picture = nconf.get('base_url') + user.picture; user.picture = nconf.get('base_url') + user.picture;
@@ -101,7 +101,7 @@ Digest.send = async function (data) {
username: userObj.username, username: userObj.username,
userslug: userObj.userslug, userslug: userObj.userslug,
notifications: notifications, notifications: notifications,
recent: data.topics, recent: topicsData,
interval: data.interval, interval: data.interval,
showUnsubscribe: true, showUnsubscribe: true,
}, function (err) { }, function (err) {