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

fix: #9404, show signatures if the target user has signature privilege

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-03-17 13:31:31 -04:00
parent ee69c1f80e
commit 801570e4cf
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/posts/user.js
View File

@@ -14,12 +14,12 @@ const privileges = require('../privileges');
module.exports = function (Posts) { module.exports = function (Posts) {
Posts.getUserInfoForPosts = async function (uids, uid) { Posts.getUserInfoForPosts = async function (uids, uid) {
const [userData, userSettings, canUseSignature] = await Promise.all([ const [userData, userSettings, signatureUids] = await Promise.all([
getUserData(uids, uid), getUserData(uids, uid),
user.getMultipleUserSettings(uids), user.getMultipleUserSettings(uids),
privileges.global.can('signature', uid), privileges.global.filterUids('signature', uids),
]); ]);
const uidsSignatureSet = new Set(signatureUids.map(uid => parseInt(uid, 10)));
const groupsMap = await getGroupsMap(userData); const groupsMap = await getGroupsMap(userData);
userData.forEach((userData, index) => { userData.forEach((userData, index) => {
@@ -35,7 +35,7 @@ module.exports = function (Posts) {
return await Promise.all(userData.map(async (userData) => { return await Promise.all(userData.map(async (userData) => {
const [isMemberOfGroups, signature, customProfileInfo] = await Promise.all([ const [isMemberOfGroups, signature, customProfileInfo] = await Promise.all([
checkGroupMembership(userData.uid, userData.groupTitleArray), checkGroupMembership(userData.uid, userData.groupTitleArray),
parseSignature(userData, uid, canUseSignature), parseSignature(userData, uid, uidsSignatureSet),
plugins.hooks.fire('filter:posts.custom_profile_info', { profile: [], uid: userData.uid }), plugins.hooks.fire('filter:posts.custom_profile_info', { profile: [], uid: userData.uid }),
]); ]);
@@ -70,8 +70,8 @@ module.exports = function (Posts) {
return await groups.isMemberOfGroups(uid, groupTitleArray); return await groups.isMemberOfGroups(uid, groupTitleArray);
} }
async function parseSignature(userData, uid, canUseSignature) { async function parseSignature(userData, uid, signatureUids) {
if (!userData.signature || !canUseSignature || meta.config.disableSignatures) { if (!userData.signature || !signatureUids.has(userData.uid) || meta.config.disableSignatures) {
return ''; return '';
} }
const result = await Posts.parseSignature(userData, uid); const result = await Posts.parseSignature(userData, uid);

5
src/privileges/global.js
View File

@@ -98,6 +98,11 @@ privsGlobal.canGroup = async function (privilege, groupName) {
return await groups.isMember(groupName, `cid:0:privileges:groups:${privilege}`); return await groups.isMember(groupName, `cid:0:privileges:groups:${privilege}`);
}; };
privsGlobal.filterUids = async function (privilege, uids) {
const privCategories = require('./categories');
return await privCategories.filterUids(privilege, 0, uids);
};
privsGlobal.give = async function (privileges, groupName) { privsGlobal.give = async function (privileges, groupName) {
await helpers.giveOrRescind(groups.join, privileges, 0, groupName); await helpers.giveOrRescind(groups.join, privileges, 0, groupName);
plugins.hooks.fire('action:privileges.global.give', { plugins.hooks.fire('action:privileges.global.give', {