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

closes #6202

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-12-29 13:27:07 -05:00
parent e563e8ac82
commit 2661a31227
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/notifications.js
View File

@@ -220,7 +220,7 @@ function pushToUids(uids, notification, callback) {
async.eachLimit(uids, 3, function (uid, next) { async.eachLimit(uids, 3, function (uid, next) {
emailer.send('notification', uid, { emailer.send('notification', uid, {
path: notification.path, path: notification.path,
subject: '[[notifications:new_notification_from, ' + meta.config.title + ']]', subject: notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]',
intro: utils.stripHTMLTags(notification.bodyShort), intro: utils.stripHTMLTags(notification.bodyShort),
body: utils.stripHTMLTags(notification.bodyLong || ''), body: utils.stripHTMLTags(notification.bodyLong || ''),
showUnsubscribe: true, showUnsubscribe: true,

2
src/topics/follow.js
View File

@@ -9,6 +9,7 @@ var notifications = require('../notifications');
var privileges = require('../privileges'); var privileges = require('../privileges');
var plugins = require('../plugins'); var plugins = require('../plugins');
var utils = require('../utils'); var utils = require('../utils');
var meta = require('../meta');
module.exports = function (Topics) { module.exports = function (Topics) {
Topics.toggleFollow = function (tid, uid, callback) { Topics.toggleFollow = function (tid, uid, callback) {
@@ -219,6 +220,7 @@ module.exports = function (Topics) {
notifications.create({ notifications.create({
type: 'new-reply', type: 'new-reply',
subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title,
bodyShort: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]', bodyShort: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
bodyLong: postData.content, bodyLong: postData.content,
pid: postData.pid, pid: postData.pid,