fix: internal helper method hasGlobalPrivilege, DRY

src/controllers/admin/users.js

@@ -243,9 +243,10 @@ async function render(req, res, data) {
 		data['filterBy_' + validator.escape(String(filter))] = true;
 	});
 
-	data.showInviteButton = await privileges.users.hasInvitePrivilege(req.uid);
 	if (data.adminInviteOnly) {
 		data.showInviteButton = await privileges.users.isAdministrator(req.uid);
+	} else {
+		data.showInviteButton = await privileges.users.hasInvitePrivilege(req.uid);
 	}
 
 	res.render('admin/manage/users', data);

src/privileges/users.js

@@ -107,21 +107,14 @@ module.exports = function (privileges) {
 		return data.canBan;
 	};
 
-	privileges.users.hasBanPrivilege = async function (uid) {
+	privileges.users.hasBanPrivilege = async uid => await hasGlobalPrivilege('ban', uid);
-		const canBan = await privileges.global.can('ban', uid);
+	privileges.users.hasInvitePrivilege = async uid => await hasGlobalPrivilege('invite', uid);
-		const data = await plugins.fireHook('filter:user.hasBanPrivilege', {
+
-			uid: uid,
+	async function hasGlobalPrivilege(privilege, uid) {
-			canBan: canBan,
+		const privilegeName = privilege.split('-').map(word => word.slice(0, 1).toUpperCase() + word.slice(1)).join('');
-		});
+		let payload = { uid };
-		return data.canBan;
+		payload[`can${privilegeName}`] = await privileges.global.can(privilege, uid);
-	};
+		payload = await plugins.fireHook(`filter:user.has${privilegeName}Privilege`, payload);
-
+		return payload[`can${privilegeName}`];
-	privileges.users.hasInvitePrivilege = async function (uid) {
+	}
-		const canInvite = await privileges.global.can('invite', uid);
-		const data = await plugins.fireHook('filter:user.hasInvitePrivilege', {
-			uid: uid,
-			canInvite: canInvite,
-		});
-		return data.canInvite;
-	};
 };