From 97e5b0fdad93c5f3d1e3e53c16b1311a46f21d35 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 8 Mar 2024 20:53:13 -0500 Subject: [PATCH] fix: reallow topic:read privilege for fediverse group --- public/src/admin/manage/privileges.js | 2 +- public/src/modules/helpers.common.js | 2 +- src/install.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.js index b124956331..5da36cb0d3 100644 --- a/public/src/admin/manage/privileges.js +++ b/public/src/admin/manage/privileges.js @@ -200,7 +200,7 @@ define('admin/manage/privileges', [ ajaxify.data.privileges = { ...ajaxify.data.privileges, ...privileges }; const tpl = parseInt(cid, 10) ? 'admin/partials/privileges/category' : 'admin/partials/privileges/global'; const isAdminPriv = ajaxify.currentPage.endsWith('admin/manage/privileges/admin'); - app.parseAndTranslate(tpl, { privileges, isAdminPriv }).then((html) => { + app.parseAndTranslate(tpl, { cid, privileges, isAdminPriv }).then((html) => { // Get currently selected filters const btnIndices = $('.privilege-filters button.btn-warning').map((idx, el) => $(el).index()).get(); $('.privilege-table-container').html(html); diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js index a2b057669e..6000df594f 100644 --- a/public/src/modules/helpers.common.js +++ b/public/src/modules/helpers.common.js @@ -192,7 +192,7 @@ module.exports = function (utils, Benchpress, relative_path) { const globalModDisabled = ['groups:moderate']; let fediverseEnabled = ['groups:view:users', 'groups:find', 'groups:read', 'groups:topics:read', 'groups:topics:create', 'groups:topics:reply', 'groups:topics:tag', 'groups:posts:edit', 'groups:posts:history', 'groups:posts:delete', 'groups:posts:upvote', 'groups:posts:downvote', 'groups:topics:delete']; if (cid === -1) { - fediverseEnabled = fediverseEnabled.slice(4); + fediverseEnabled = fediverseEnabled.slice(3); } const disabled = (member === 'guests' && (guestDisabled.includes(priv.name) || priv.name.startsWith('groups:admin:'))) || diff --git a/src/install.js b/src/install.js index 5be12763a2..53a6941c54 100644 --- a/src/install.js +++ b/src/install.js @@ -464,7 +464,7 @@ async function giveWorldPrivileges() { const guestPrivileges = ['groups:find', 'groups:read', 'groups:topics:read']; await privileges.categories.give(defaultPrivileges, -1, ['registered-users']); - await privileges.categories.give(defaultPrivileges.slice(3), -1, ['fediverse']); // different priv set for fediverse + await privileges.categories.give(defaultPrivileges.slice(2), -1, ['fediverse']); // different priv set for fediverse await privileges.categories.give(modPrivileges, -1, ['administrators', 'Global Moderators']); await privileges.categories.give(guestPrivileges, -1, ['guests', 'spiders']); }