Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 15:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

some req.query fixes

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-04-09 12:53:51 -04:00
parent 215e3e177f
commit ac5d242f6d
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/controllers/search.js
View File

@@ -32,10 +32,11 @@ searchController.search = async function (req, res, next) {
'search:content': privileges.global.can('search:content', req.uid),
'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') ||
const query = { ...req.query };
query.in = req.query.in || meta.config.searchDefaultIn || 'titlesposts';
let allowed = (query.in === 'users' && userPrivileges['search:users']) ||
(query.in === 'tags' && userPrivileges['search:tags']) ||
(query.in === 'categories') ||
(['titles', 'titlesposts', 'posts', 'bookmarks'].includes(req.query.in) && userPrivileges['search:content']);
({ allowed } = await plugins.hooks.fire('filter:search.isAllowed', {
uid: req.uid,
@@ -47,20 +48,20 @@ searchController.search = async function (req, res, next) {
}
if (req.query.categories && !Array.isArray(req.query.categories)) {
req.query.categories = [req.query.categories];
query.categories = [req.query.categories];
}
if (req.query.hasTags && !Array.isArray(req.query.hasTags)) {
req.query.hasTags = [req.query.hasTags];
query.hasTags = [req.query.hasTags];
}
const data = {
query: req.query.term,
searchIn: req.query.in,
searchIn: query.in,
matchWords: req.query.matchWords || 'all',
postedBy: req.query.by,
categories: req.query.categories,
categories: query.categories,
searchChildren: req.query.searchChildren,
hasTags: req.query.hasTags,
hasTags: query.hasTags,
replies: validator.escape(String(req.query.replies || '')),
repliesFilter: validator.escape(String(req.query.repliesFilter || '')),
timeRange: validator.escape(String(req.query.timeRange || '')),
@@ -70,7 +71,7 @@ searchController.search = async function (req, res, next) {
page: page,
itemsPerPage: req.query.itemsPerPage,
uid: req.uid,
qs: req.query,
qs: query,
};
const [searchData] = await Promise.all([

4
src/controllers/unread.js
View File

@@ -59,8 +59,8 @@ unreadController.get = async function (req, res) {
});
if (userSettings.usePagination && (page < 1 || page > data.pageCount)) {
req.query.page = Math.max(1, Math.min(data.pageCount, page));
return helpers.redirect(res, `/unread?${querystring.stringify(req.query)}`);
const query = { ...req.query, page: Math.max(1, Math.min(data.pageCount, page))};
return helpers.redirect(res, `/unread?${querystring.stringify(query)}`);
}
data.canPost = canPost;
data.showSelect = true;

2
src/middleware/headers.js
View File

@@ -86,6 +86,7 @@ module.exports = function (middleware) {
if (req.query.lang) {
const langs = await listCodes();
if (!langs.includes(req.query.lang)) {
// TODO: cant set req.query.lang
req.query.lang = meta.config.defaultLang;
}
return next();
@@ -97,6 +98,7 @@ module.exports = function (middleware) {
if (!lang) {
return next();
}
// TODO: cant set req.query.lang
req.query.lang = lang;
}

5
src/routes/write/posts.js
View File

@@ -51,7 +51,10 @@ module.exports = function () {
// Shorthand route to access post routes by topic index
// TODO: upgrade to express 5
// router.all('/+byIndex/:index*?', [middleware.checkRequired.bind(null, ['tid'])], controllers.write.posts.redirectByIndex);
// router.all('/+byIndex/:index*?', [
// middleware.checkRequired.bind(null, ['tid']),
// ], controllers.write.posts.redirectByIndex);
return router;
};