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

refactor: simpler check in user.blocks.filter

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-29 22:33:28 -04:00
parent 27016d221c
commit a02ae6f5df
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/user/blocks.js
View File

@@ -100,14 +100,7 @@ module.exports = function (User) {
property = 'uid'; property = 'uid';
} }
if (!Array.isArray(set) || !set.length || !set.every((item) => { if (!Array.isArray(set) || !set.length) {
if (!item) {
return false;
}
const check = item.hasOwnProperty(property) ? item[property] : item;
return ['number', 'string'].includes(typeof check);
})) {
return set; return set;
} }
@@ -116,7 +109,7 @@ module.exports = function (User) {
const blockedSet = new Set(blocked_uids); const blockedSet = new Set(blocked_uids);
set = set.filter(function (item) { set = set.filter(function (item) {
return !blockedSet.has(parseInt(isPlain ? item : item[property], 10)); return !blockedSet.has(parseInt(isPlain ? item : (item && item[property]), 10));
}); });
const data = await plugins.fireHook('filter:user.blocks.filter', { set: set, property: property, uid: uid, blockedSet: blockedSet }); const data = await plugins.fireHook('filter:user.blocks.filter', { set: set, property: property, uid: uid, blockedSet: blockedSet });