refactor: improvements

This commit is contained in:
gasoved
2021-02-03 19:35:32 +03:00
committed by Julian Lam
parent 53e0d4d2e0
commit 970bd06fd2
3 changed files with 8 additions and 9 deletions

View File

@@ -116,13 +116,11 @@ module.exports = function (User) {
User.bans.calcExpiredFromUserData = async function (userData) {
const isArray = Array.isArray(userData);
userData = isArray ? userData : [userData];
userData = await Promise.all(userData.map(async function (userData) {
const banned = await groups.isMember(userData.uid, groups.BANNED_USERS);
return {
banned: banned,
'banned:expire': userData && userData['banned:expire'],
banExpired: userData && userData['banned:expire'] <= Date.now() && userData['banned:expire'] !== 0,
};
const banned = await groups.isMembers(userData.map(u => u.uid), groups.BANNED_USERS);
userData = userData.map((userData, index) => ({
banned: banned[index],
'banned:expire': userData && userData['banned:expire'],
banExpired: userData && userData['banned:expire'] <= Date.now() && userData['banned:expire'] !== 0,
}));
return isArray ? userData : userData[0];
};