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: improvements

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/accounts/helpers.js
View File

@@ -91,6 +91,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID) {
}); });
userData.sso = results.sso.associations; userData.sso = results.sso.associations;
userData.banned = Boolean(userData.banned);
userData.website = validator.escape(String(userData.website || '')); userData.website = validator.escape(String(userData.website || ''));
userData.websiteLink = !userData.website.startsWith('http') ? 'http://' + userData.website : userData.website; userData.websiteLink = !userData.website.startsWith('http') ? 'http://' + userData.website : userData.website;
userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), ''); userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), '');

4
src/upgrades/1.16.0/banned_users_group.js → src/upgrades/1.17.0/banned_users_group.js
View File

@@ -31,7 +31,7 @@ module.exports = {
await db.sortedSetAdd( await db.sortedSetAdd(
'group:banned-users:members', 'group:banned-users:members',
uids.map(() => now), uids.map(() => now),
uids.map(uid => uid) uids
); );
await db.sortedSetRemove( await db.sortedSetRemove(
@@ -41,7 +41,7 @@ module.exports = {
'group:unverified-users:members', 'group:unverified-users:members',
'group:Global Moderators:members', 'group:Global Moderators:members',
], ],
uids.map(uid => uid) uids
); );
}, { }, {
batch: 500, batch: 500,

12
src/user/bans.js
View File

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