diff --git a/src/notifications.js b/src/notifications.js index a65f261607..9bb92eb4ce 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -9,6 +9,7 @@ var async = require('async'), utils = require('../public/src/utils'), events = require('./events'), User = require('./user'), + groups = require('./groups'), meta = require('./meta'); (function(Notifications) { @@ -129,12 +130,29 @@ var async = require('async'), }, function(err) { if (callback) { - callback(true); + callback(null, true); } }); }); }; + // Note: This method used in mentions plugin. If still unused in core as of 0.6.0, please move to mentions plugin itself. + Notifications.pushGroup = function(nid, groupName, callback) { + if (!callback) { + callback = function() {}; + } + + groups.get(groupName, {}, function(err, groupObj) { + if (!err && groupObj) { + if (groupObj.memberCount > 0) { + Notifications.push(nid, groupObj.members, callback); + } + } else { + callback(err); + } + }); + }; + function checkReplace(uniqueId, uid, newNotifObj, callback) { var replace = false, matched = false; diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index ce24c362ea..2b224a8274 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -209,9 +209,7 @@ function sendChatNotification(fromuid, touid, username) { uniqueId: 'notification_' + fromuid + '_' + touid, from: fromuid }, function(nid) { - notifications.push(nid, [touid], function(success) { - - }); + notifications.push(nid, [touid]); }); } }