From e7352a6a859589e6500795ef315982cc67bbaa89 Mon Sep 17 00:00:00 2001 From: philipda Date: Fri, 23 Jan 2026 20:18:29 +0000 Subject: [PATCH 1/3] smell removed --- src/controllers/search.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 8b21189e7d..78bcb8160a 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -33,10 +33,14 @@ searchController.search = async function (req, res, next) { 'search:tags': privileges.global.can('search:tags', req.uid), }); req.query.in = req.query.in || meta.config.searchDefaultIn || 'titlesposts'; - let allowed = (req.query.in === 'users' && userPrivileges['search:users']) || - (req.query.in === 'tags' && userPrivileges['search:tags']) || - (req.query.in === 'categories') || - (['titles', 'titlesposts', 'posts', 'bookmarks'].includes(req.query.in) && userPrivileges['search:content']); + + const canSearchUsers = req.query.in === 'users' && userPrivileges['search:users']; + const canTagUsers = req.query.in === 'tags' && userPrivileges['search:tags']; + const isCategory = req.query.in === 'cnoategories'; + const typesInQuery = ['titles', 'titlesposts', 'posts', 'bookmarks'].includes(req.query.in) && userPrivileges['search:content']; + + let allowed = canSearchUsers || canTagUsers || isCategory || typesInQuery; + ({ allowed } = await plugins.hooks.fire('filter:search.isAllowed', { uid: req.uid, query: req.query, From a3f0cfff88276b5307b786cf594dfc6ab7e5e84e Mon Sep 17 00:00:00 2001 From: philipda Date: Fri, 23 Jan 2026 20:22:07 +0000 Subject: [PATCH 2/3] console log statements added --- src/controllers/search.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index 78bcb8160a..cd2ef2390a 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -34,11 +34,12 @@ searchController.search = async function (req, res, next) { }); req.query.in = req.query.in || meta.config.searchDefaultIn || 'titlesposts'; + console.log('-----------BEFORE RUNNING REFACTORED CODE----------------'); const canSearchUsers = req.query.in === 'users' && userPrivileges['search:users']; const canTagUsers = req.query.in === 'tags' && userPrivileges['search:tags']; const isCategory = req.query.in === 'cnoategories'; const typesInQuery = ['titles', 'titlesposts', 'posts', 'bookmarks'].includes(req.query.in) && userPrivileges['search:content']; - + console.log('-----------AFTER RUNNING REFACTORED CODE----------------'); let allowed = canSearchUsers || canTagUsers || isCategory || typesInQuery; ({ allowed } = await plugins.hooks.fire('filter:search.isAllowed', { From 7087ca36639f2131c5a9420a602f596593bf94cc Mon Sep 17 00:00:00 2001 From: philipda Date: Fri, 23 Jan 2026 20:22:45 +0000 Subject: [PATCH 3/3] console log statements removed --- src/controllers/search.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/search.js b/src/controllers/search.js index cd2ef2390a..78bcb8160a 100644 --- a/src/controllers/search.js +++ b/src/controllers/search.js @@ -34,12 +34,11 @@ searchController.search = async function (req, res, next) { }); req.query.in = req.query.in || meta.config.searchDefaultIn || 'titlesposts'; - console.log('-----------BEFORE RUNNING REFACTORED CODE----------------'); const canSearchUsers = req.query.in === 'users' && userPrivileges['search:users']; const canTagUsers = req.query.in === 'tags' && userPrivileges['search:tags']; const isCategory = req.query.in === 'cnoategories'; const typesInQuery = ['titles', 'titlesposts', 'posts', 'bookmarks'].includes(req.query.in) && userPrivileges['search:content']; - console.log('-----------AFTER RUNNING REFACTORED CODE----------------'); + let allowed = canSearchUsers || canTagUsers || isCategory || typesInQuery; ({ allowed } = await plugins.hooks.fire('filter:search.isAllowed', {