Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

parsing the post content that's passed into bodyLong in notifs #1720

Browse Source
This commit is contained in:
Julian Lam
2014-06-21 01:14:49 -04:00
parent f9b5bf83ad
commit d229cd21b2
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/socket.io/posts.js
View File

@@ -100,14 +100,16 @@ function sendNotificationToPostOwner(data, uid, notification) {
}
async.parallel({
username: function(next) {
user.getUserField(uid, 'username', next);
},
topicData: function(next) {
topics.getTopicFields(postData.tid, ['slug', 'content'], next);
},
index: function(next) {
posts.getPidIndex(data.pid, next);
username: async.apply(user.getUserField, uid, 'username'),
slug: async.apply(topics.getTopicField, postData.tid, 'slug'),
index: async.apply(posts.getPidIndex, data.pid),
postContent: function(next) {
async.waterfall([
async.apply(posts.getPostField, data.pid, 'content'),
function(content, next) {
postTools.parse(content, next);
}
], next);
}
}, function(err, results) {
if (err) {
@@ -116,8 +118,8 @@ function sendNotificationToPostOwner(data, uid, notification) {
notifications.create({
bodyShort: '[[' + notification + ', ' + results.username + ']]',
bodyLong: results.topicData.content,
path: nconf.get('relative_path') + '/topic/' + results.topicData.slug + '/' + results.index,
bodyLong: results.postContent,
path: nconf.get('relative_path') + '/topic/' + results.slug + '/' + results.index,
uniqueId: 'post:' + data.pid,
from: uid
}, function(nid) {
@@ -293,6 +295,12 @@ SocketPosts.flag = function(socket, pid, callback) {
message = '[[notifications:user_flagged_post, ' + username + ']]';
posts.getPostFields(pid, ['tid', 'uid', 'content'], next);
},
function(postData, next) {
postTools.parse(postData.content, function(err, parsed) {
postData.content = parsed;
next(undefined, postData);
});
},
function(postData, next) {
post = postData;
topics.getTopicField(postData.tid, 'slug', next);