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

use includes instead of indexOf

Browse Source 
use _.uniq instead of filter&indexOf
This commit is contained in:
Barış Soner Uşaklı
2018-10-20 14:40:48 -04:00
parent a6c70412db
commit 26d4e0852f
57 changed files with 156 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/notifications.js
View File

@@ -122,27 +122,20 @@ Notifications.filterExists = function (nids, callback) {
Notifications.findRelated = function (mergeIds, set, callback) {
// A related notification is one in a zset that has the same mergeId
var _nids;
var nids;
async.waterfall([
async.apply(db.getSortedSetRevRange, set, 0, -1),
function (nids, next) {
_nids = nids;
var keys = nids.map(function (nid) {
return 'notifications:' + nid;
});
function (_nids, next) {
nids = _nids;
var keys = nids.map(nid => 'notifications:' + nid);
db.getObjectsFields(keys, ['mergeId'], next);
},
function (sets, next) {
sets = sets.map(function (set) {
return set.mergeId;
});
next(null, _nids.filter(function (nid, idx) {
return mergeIds.indexOf(sets[idx]) !== -1;
}));
sets = sets.map(set => set.mergeId);
var mergeSet = new Set(mergeIds);
next(null, nids.filter((nid, idx) => mergeSet.has(sets[idx])));
},
], callback);
};
@@ -536,7 +529,7 @@ Notifications.merge = function (notifications, callback) {
// Each isolated mergeId may have multiple differentiators, so process each separately
differentiators = isolated.reduce(function (cur, next) {
differentiator = next.mergeId.split('|')[1] || 0;
if (cur.indexOf(differentiator) === -1) {
if (!cur.includes(differentiator)) {
cur.push(differentiator);
}