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

fixed #1489 -- made checkReplace error-first, added missing callback, added missing object field to db query

Browse Source
This commit is contained in:
Julian Lam
2014-05-06 10:22:55 -04:00
parent 7f6ae6df9f
commit 08cf6bc5e6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/notifications.js
View File

@@ -21,7 +21,6 @@ var async = require('async'),
}; };
Notifications.get = function(nid, uid, callback) { Notifications.get = function(nid, uid, callback) {
db.exists('notifications:' + nid, function(err, exists) { db.exists('notifications:' + nid, function(err, exists) {
if (err) { if (err) {
winston.error('[notifications.get] Could not retrieve nid ' + nid + ': ' + err.message); winston.error('[notifications.get] Could not retrieve nid ' + nid + ': ' + err.message);
@@ -117,7 +116,7 @@ var async = require('async'),
Notifications.get(nid, null, function(notif_data) { Notifications.get(nid, null, function(notif_data) {
async.each(uids, function(uid, next) { async.each(uids, function(uid, next) {
if (parseInt(uid, 10) > 0) { if (parseInt(uid, 10) > 0) {
checkReplace(notif_data.uniqueId, uid, notif_data, function(replace) { checkReplace(notif_data.uniqueId, uid, notif_data, function(err, replace) {
if (replace) { if (replace) {
db.sortedSetAdd('uid:' + uid + ':notifications:unread', notif_data.datetime, nid); db.sortedSetAdd('uid:' + uid + ':notifications:unread', notif_data.datetime, nid);
websockets.in('uid_' + uid).emit('event:new_notification', notif_data); websockets.in('uid_' + uid).emit('event:new_notification', notif_data);
@@ -145,7 +144,7 @@ var async = require('async'),
return 'notifications:' + nid; return 'notifications:' + nid;
}); });
db.getObjectsFields(keys, ['uniqueId', 'importance'], function(err, nid_infos) { db.getObjectsFields(keys, ['nid', 'uniqueId', 'importance'], function(err, nid_infos) {
if (err) { if (err) {
return next(err); return next(err);
} }
@@ -158,7 +157,10 @@ var async = require('async'),
db.sortedSetRemove(set, nid_info.nid); db.sortedSetRemove(set, nid_info.nid);
} }
} }
}); });
next();
}); });
}); });
} }
@@ -176,7 +178,7 @@ var async = require('async'),
replace = true; replace = true;
} }
callback(replace); callback(null, replace);
} }
}); });
} }