Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-16 01:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

notifications.create can return null

Browse Source
This commit is contained in:
barisusakli
2016-01-27 20:03:28 +02:00
parent 19c7411c38
commit add4e6ee5b
6 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/groups/membership.js
View File

@@ -74,26 +74,30 @@ module.exports = function(Groups) {
Groups.requestMembership = function(groupName, uid, callback) {
async.waterfall([
async.apply(inviteOrRequestMembership, groupName, uid, 'request'),
function(next) {
user.getUserField(uid, 'username', function(err, username) {
if (err) {
return next(err);
function (next) {
user.getUserField(uid, 'username', next);
},
function (username, next) {
async.parallel({
notification: function(next) {
notifications.create({
bodyShort: '[[groups:request.notification_title, ' + username + ']]',
bodyLong: '[[groups:request.notification_text, ' + username + ', ' + groupName + ']]',
nid: 'group:' + groupName + ':uid:' + uid + ':request',
path: '/groups/' + utils.slugify(groupName)
}, next);
},
owners: function(next) {
Groups.getOwners(groupName, next);
}
next(null, {
bodyShort: '[[groups:request.notification_title, ' + username + ']]',
bodyLong: '[[groups:request.notification_text, ' + username + ', ' + groupName + ']]',
nid: 'group:' + groupName + ':uid:' + uid + ':request',
path: '/groups/' + utils.slugify(groupName)
});
});
}, next);
},
async.apply(notifications.create),
function(notification, next) {
Groups.getOwners(groupName, function(err, ownerUids) {
next(null, notification, ownerUids);
});
},
async.apply(notifications.push)
function (results, next) {
if (!results.notification || !results.owners.length) {
return next();
}
notifications.push(results.notification, results.owners, next);
}
], callback);
};
@@ -123,10 +127,13 @@ module.exports = function(Groups) {
nid: 'group:' + groupName + ':uid:' + uid + ':invite',
path: '/groups/' + utils.slugify(groupName)
}),
function(notification, next) {
next(null, notification, [uid]);
},
async.apply(notifications.push)
function (notification, next) {
if (!notification) {
return next();
}
notifications.push(notification, [uid]);
}
], callback);
};